remove SourceTree as diff/merge tool. Vim will be configured for this later