First version of content in german
Fixed merge conflict