i changed it
Merge branch 'master' of https://github.com/aveenbhd/github-test

Conflicts:
	my first file.txt