Fix on UTF-8 encoding error
Merge conflict of pom xml