yea
Merge branch 'master' of github.com:gimlids/ShellConfig
fish ls
git 'unadd'
Merge branch 'master' of github.com:gimlids/ShellConfig

Conflicts:
	.gitconfig