Rename pom.xml.diff to pom.xml