delete conflicts