I have to commit in order to merge
Merge github.com:JDevlieghere/SORTES-Course
Merge github.com:JDevlieghere/SORTES-Course
Merge conflicts?