Revert "merge tool test"

This reverts commit 01cfa73dc0fc35a67d2d7a66258e2e1c5ea5d378.