Commit from git ui

i am using git commit from windows ui
Merge branch 'chahatm-patch-1'

Conflicts:
	index.php