delete conflict text