Fixed some weird things that happened after my first
git merge conflict experience.