Update po files
Fix merge conflict