clean errors from merge