This is for 2nd commit
this is 3rd commit
Fixed conflicts

Merge remote-tracking branch 'origin/Testing'

Conflicts:
	testing.txt
s is commit