enable git diff3 view and update vim conflict markers