check local conflics
Merge branch 'master' of https://github.com/ash261080/testgitrepo

Conflicts:
	init.txt