fixed umlaut
solved merge conflict