Removed stray '<<<HEAD' conflict marker.