update kiya hai local me conflict ke liye
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	file1.txt