[issue 1]
[line 2]
Merge branch 'iss1'

Conflicts:
	README