manually solved a merging conflict concerning the German data files