update php file
fixed merge conflict