updated merge tool and username