after branch craetion 1.txt
test
rahul changed from suraj
suraj
nitin
rahul
theirs changed accepeted in merge
Percona Scripts added
Merge branch 'master' of https://github.com/surajrathore/githome

Conflicts:
	1.txt

merged 1.txt