update
merge
Merge remote branch 'origin/master'

Conflicts:
	ns.php
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
using theirs