Resolve conflict

Merge branch 'main' of https://gitlab.rrz.uni-hamburg.de/baz9527/demo_final

# Conflicts:
#	demo_final.html
#	demo_final.md
#	demo_final_files/figure-html/unnamed-chunk-3-1.png