removed the >>>><<<< from the merge conflict
Merge pull request #2 from jshawl/fix-merge-conflict

removed the >>>><<<< from the merge conflict