Fixes #1: conflict message not appearing.
Merge branch 'master' of https://github.com/EricMountain/TaskSlayer
Trying to amend a commit.