resolve a merge problem for po files.