[#111] Fix merge conflicts

5 jobs for 111-wassersimulation-mit-interaktion in 9 minutes and 14 seconds (queued for 11 seconds)