fixed merge tool