Deleting leftover from conflict