adding some new options for git and other shortcuts
updating conflicts