Fixed git merge tool configuration and change default folder name