Update php.md

Tiny edits.
resolved conflicts