a change
another change
changes on two files
a change while another change happens.
conflicting change.
resolving conflict
meanwhile
another conflict
resolve another conflict
fourth change
third change
Merge branch 'master' of https://github.com/ismo-conguairta/Spoon-Knife

Conflicts:
	README
change
change doh
Merge branch 'master' of https://github.com/ismo-conguairta/Spoon-Knife
test
Merge branch 'master' of https://github.com/ismo-conguairta/Spoon-Knife
delete row (changed)
remove 2 lines
delete 2 rows