I think I fixed my first ever merge conflict! I am not sure though, if I did the right thing or not.

As of now, my commits are fine, my only branch is master and the changes are all there.

Have I got it right? I hope I have.

TODO: Discuss with Kat.