Remove the git diff text (<<<<<<< HEAD ...) in the generalMultilang.properties