Fix merge conflict on master

Summary:

Test Plan:

Reviewers:

Subscribers:

Tasks:

Tags:

include/rocksdb/status.h

@@ -26,7 +26,7 @@ class Status {
  public:
   // Create a success status.
   Status() : code_(kOk), subcode_(kNone), sev_(kNoError), state_(nullptr) {}
-  ~Status() { free(void *) state_; }
+  ~Status() { free((void *) state_); }
 
   // Copy the specified status.
   Status(const Status& s);
@@ -307,12 +307,8 @@ inline Status& Status::operator=(const Status& s) {
   if (this != &s) {
     code_ = s.code_;
     subcode_ = s.subcode_;
-<<<<<<< HEAD
-    free((void *) state_);
-=======
     sev_ = s.sev_;
-    delete[] state_;
->>>>>>> Refactor bg_error_ code; Add Severity to Status
+    free((void *) state_);
     state_ = (s.state_ == nullptr) ? nullptr : CopyState(s.state_);
   }
   return *this;
@@ -336,13 +332,9 @@ inline Status& Status::operator=(Status&& s)
     s.code_ = kOk;
     subcode_ = std::move(s.subcode_);
     s.subcode_ = kNone;
-<<<<<<< HEAD
-    free((void *)state_);
-=======
     sev_ = std::move(s.sev_);
     s.sev_ = kNoError;
-    delete[] state_;
->>>>>>> Refactor bg_error_ code; Add Severity to Status
+    free((void *)state_);
     state_ = nullptr;
     std::swap(state_, s.state_);
   }