fixed pom.xml broken by eclipse merging tool