Restoring merge (2)
Removing unnecessary TSRMLS_CC, restoring merge