remove part of diff put by a merge which was not cleaned