updated php files
merge