delete conflicts markers