a modıfıcatıon
Merge remote-tracking branch 'origin/master'

Conflicts:
	xyz.txt
a modıfıcatıon
Merge remote-tracking branch 'origin/master'

Conflicts:
	xyz.txt