git file example changing
modified working branch
Merge branch 'working'

Conflicts:
	gitconfig