conflict text removal