First draft of conflict resolution finished
Merge branch 'master' of https://github.com/SimonKaltenbacher/dbprakt