Fixed one more merge issue in pom