Resolved the issue
changed
Changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	SalesTools/a.php