added a custom git mergetool thing and another script