test 1
2
Merge branch 'master' of https://github.com/junaidbhura/test

Conflicts:
	test.txt
Mergy!

Conflicts:
	test.txt
shiz
whatevs