merge clean up