Added diffconfilict as default git merge tool
Merge remote-tracking branch 'origin/navi' into marvin