Git is making me commit, so I don't know what changes this commit has.
Fixed merge conflicts