removing crud from merge