Conflict text removed