remove dead merging code
cleanup merging code
updated translations, fixed trailing newlines