Merge changes to po files