another path conflict example
Merge branch 'master' of github.com:tromp/cuckoo
Conflicts:
	cuckoo.pdf
fix bug
fix bug
duh