editing a line
adding one more line again
testing merge again
merge
changing it back to hello world
Merge branch 'feature-a'

Conflicts:
	b.txt

Merge
fixing a file
editing feature a
master change
feature-b changes
Merge branch 'feature-a'

Conflicts:
	b.txt