alternative change
this one
Merge remote-tracking branch 'origin'
Conflicts resolved

Conflicts:
	README