merge trunk for pom.xml