change git global config
Tmux conf
iroiro
Current config
Merge remote-tracking branch 'origin/master'

Conflicts:
	_vimrc