add conflic
Merge branch 'master' of https://github.com/nandj/test

Conflicts:
	foo.txt