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