Added PHP notes
Fixed merge conflicts