delete conflicts error lines