more merge clean up