more merge leftovers