Remove conflict markers and resolve conflict

debian/patches/fix-8-to-10-migration.patch

@@ -13,11 +13,7 @@ index 0abae70c443..e4ff8261120 100644
 +      # If the features table does not exist, don't check the feature, just return
 +      # the default
 +      unless Feature::FlipperFeature.table_exists?
-<<<<<<< HEAD
-+        return (status == MigrationStatus::OPT_OUT) || opt_into_all_features?
-=======
 +        return false
->>>>>>> master
 +      end
 +
        feature = Feature.get("gitaly_#{feature_name}")