changes sublime settings
strange error
gitconfig
solved merge conflicts