remove merge leftovers