Removed Merge Conflict text