fixed merge error in ext/oci8