Removing '<<<<<<< HEAD' left over from a merge conflict

See 87718db7fb00