updating Kapitel_2 merging state failed with last push