Add all php changes
Conflict resolve