removes merge conflicts in tine20/Courses/translations/de.po