cleanup: fix merge leftovers