add hello
add world
hi
Merge branch 'future'

Conflicts:
	hello.txt