cleanup from merge error