try local for conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyGitProject/index.php