Feature/create merge conflict

Blau machen!