mast
Merge remote-tracking branch 'origin/feature-xyz'

Conflicts:
	1Master.txt
Update 1Feature-xyz.txt
Update 1Master.txt
aaa
Create README.md
Create res.txt
added lines from client
added lines on server
added another line on server
Merge remote-tracking branch 'origin/master'

Conflicts:
	res.txt
fresh on server
ssss
Merge branch 'master' of https://github.com/RahulMisra2000/repo1

Conflicts:
	res.txt
added line number 2 on server
added new file in master
added line 2 on server
added line 2 on client
Resolved 1.txt

Conflicts:
	1.txt
Update 1.txt