Fixed pom.xml warnings
Fixed merge