No Merge Conflict Markers In File