Fix Merge on pom