Comparison for rebase and merge
Merge branch 'feature1'

Conflicts:
	README