Removed extra merge line from pom.xml