merging php-core