i want commit from my windowsss22222222222222

i want commit from my windowsss22222222222222
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html