fix merge unit test