Fix on UTF-8 encoding error
fix merge conflict pom file