Fix group of /Applications
Remove merge tool from Git configuration