fixing merge leftovers