merge tool and file renames