removed line
removed third lin
Merge branch 'test1'
test
conflich1
conflict2
Merge branch 'test2'

Conflicts:
	README.md