conflict part1
conflict part 2
conflict part 3
Merge branch 'bar'

Conflicts:
	README.txt