Merge branch 'master' of C:\xampp\htdocs\git\his with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	cot.php
abc