markup 2020 Course collaboration for 202000010. You need to solve this conflict in a generic manner such that your classmates can also merge their forked branch into this master branch. So think about a solution on your end. Gerko
