merging in php changes