local commit in branch
Merge branch 'localBr'

Conflicts:
	README