Updated merge tool and added alias for our app deploy script.