fix(merge-conflict): remove HEAD >>> stuff from merge conflict
Merge pull request #6 from HabitRPG/master

fix(merge-conflict): remove HEAD >>> stuff from merge conflict