local change after remote change
Merge branch 'gh-pages' of https://github.com/lumixraku/repo into gh-pages

Conflicts:
	ATestFile.txt
after conflict i made local file same to the remote