merge leftovers again