clean merge without deep, better UT for merge