Whoops! Unresolved merge conflicts in de.yml solved