fix bad merge leftovers