Removing unnecessary TSRMLS_CC, restoring merge