@lansweeper/data-platform-outbound-grpc 0.1.5 → 0.1.7

package/src/main/java/com/lansweeper/dp/outbound/v1/CatalogBrand.java

@@ -16,7 +16,6 @@ private static final long serialVersionUID = 0L;
     super(builder);
   }
   private CatalogBrand() {
-    makeKey_ = "";
     makeName_ = "";
     countryCode_ = "";
     logoImageUrl_ = "";
@@ -73,167 +72,156 @@ private static final long serialVersionUID = 0L;
             id_ = input.readInt64();
             break;
           }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            makeKey_ = s;
-            break;
-          }
           case 26: {
             java.lang.String s = input.readStringRequireUtf8();
 
             makeName_ = s;
             break;
           }
-          case 32: {
-            bitField0_ |= 0x00000001;
-            overrideId_ = input.readInt64();
-            break;
-          }
           case 40: {
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000002;
             lastUpdateTime_ = input.readInt64();
             break;
           }
           case 50: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000008;
+            bitField0_ |= 0x00000004;
             countryCode_ = s;
             break;
           }
           case 58: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000010;
+            bitField0_ |= 0x00000008;
             logoImageUrl_ = s;
             break;
           }
           case 66: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000020;
+            bitField0_ |= 0x00000010;
             bannerImageUrl_ = s;
             break;
           }
           case 74: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000040;
+            bitField0_ |= 0x00000020;
             wikipediaId_ = s;
             break;
           }
           case 82: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000080;
+            bitField0_ |= 0x00000040;
             wikipediaLangCode_ = s;
             break;
           }
           case 90: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000100;
+            bitField0_ |= 0x00000080;
             websiteUrl_ = s;
             break;
           }
           case 98: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000200;
+            bitField0_ |= 0x00000100;
             supportUrl_ = s;
             break;
           }
           case 106: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000400;
+            bitField0_ |= 0x00000200;
             supportPhone_ = s;
             break;
           }
           case 114: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000800;
+            bitField0_ |= 0x00000400;
             facebookAccount_ = s;
             break;
           }
           case 122: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00001000;
+            bitField0_ |= 0x00000800;
             twitterAccount_ = s;
             break;
           }
           case 130: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00002000;
+            bitField0_ |= 0x00001000;
             warrantyUrl_ = s;
             break;
           }
           case 138: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00004000;
+            bitField0_ |= 0x00002000;
             warrantyDirectUrl_ = s;
             break;
           }
           case 144: {
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             parentId_ = input.readInt64();
             break;
           }
           case 152: {
-            bitField0_ |= 0x04000000;
+            bitField0_ |= 0x02000000;
             matchScore_ = input.readInt32();
             break;
           }
           case 162: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00008000;
+            bitField0_ |= 0x00004000;
             communityUrl_ = s;
             break;
           }
           case 170: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00010000;
+            bitField0_ |= 0x00008000;
             linkedinAccount_ = s;
             break;
           }
           case 178: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00020000;
+            bitField0_ |= 0x00010000;
             instagramAccount_ = s;
             break;
           }
           case 186: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00040000;
+            bitField0_ |= 0x00020000;
             youtubeAccount_ = s;
             break;
           }
           case 194: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00080000;
+            bitField0_ |= 0x00040000;
             pinterestAccount_ = s;
             break;
           }
           case 200: {
-            bitField0_ |= 0x00100000;
+            bitField0_ |= 0x00080000;
             classHardware_ = input.readBool();
             break;
           }
           case 208: {
-            bitField0_ |= 0x00200000;
+            bitField0_ |= 0x00100000;
             classSoftware_ = input.readBool();
             break;
           }
           case 216: {
-            bitField0_ |= 0x00400000;
+            bitField0_ |= 0x00200000;
             classConsumer_ = input.readBool();
             break;
           }
           case 224: {
-            bitField0_ |= 0x00800000;
+            bitField0_ |= 0x00400000;
             classEnterprise_ = input.readBool();
             break;
           }
           case 232: {
-            bitField0_ |= 0x01000000;
+            bitField0_ |= 0x00800000;
             classIndustrial_ = input.readBool();
             break;
           }
           case 240: {
-            bitField0_ |= 0x02000000;
+            bitField0_ |= 0x01000000;
             classIndividual_ = input.readBool();
             break;
           }
@@ -281,44 +269,6 @@ private static final long serialVersionUID = 0L;
     return id_;
   }
 
-  public static final int MAKE_KEY_FIELD_NUMBER = 2;
-  private volatile java.lang.Object makeKey_;
-  /**
-   * <code>string make_key = 2;</code>
-   * @return The makeKey.
-   */
-  @java.lang.Override
-  public java.lang.String getMakeKey() {
-    java.lang.Object ref = makeKey_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      makeKey_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string make_key = 2;</code>
-   * @return The bytes for makeKey.
-   */
-  @java.lang.Override
-  public com.google.protobuf.ByteString
-      getMakeKeyBytes() {
-    java.lang.Object ref = makeKey_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      makeKey_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
   public static final int MAKE_NAME_FIELD_NUMBER = 3;
   private volatile java.lang.Object makeName_;
   /**
@@ -357,25 +307,6 @@ private static final long serialVersionUID = 0L;
     }
   }
 
-  public static final int OVERRIDE_ID_FIELD_NUMBER = 4;
-  private long overrideId_;
-  /**
-   * <code>int64 override_id = 4;</code>
-   * @return Whether the overrideId field is set.
-   */
-  @java.lang.Override
-  public boolean hasOverrideId() {
-    return ((bitField0_ & 0x00000001) != 0);
-  }
-  /**
-   * <code>int64 override_id = 4;</code>
-   * @return The overrideId.
-   */
-  @java.lang.Override
-  public long getOverrideId() {
-    return overrideId_;
-  }
-
   public static final int PARENT_ID_FIELD_NUMBER = 18;
   private long parentId_;
   /**
@@ -384,7 +315,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasParentId() {
-    return ((bitField0_ & 0x00000002) != 0);
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>int64 parent_id = 18;</code>
@@ -403,7 +334,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLastUpdateTime() {
-    return ((bitField0_ & 0x00000004) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <code>int64 last_update_time = 5;</code>
@@ -422,7 +353,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCountryCode() {
-    return ((bitField0_ & 0x00000008) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    * <code>string country_code = 6;</code>
@@ -468,7 +399,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLogoImageUrl() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    * <code>string logo_image_url = 7;</code>
@@ -514,7 +445,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasBannerImageUrl() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
   /**
    * <code>string banner_image_url = 8;</code>
@@ -560,7 +491,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasWikipediaId() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return ((bitField0_ & 0x00000020) != 0);
   }
   /**
    * <code>string wikipedia_id = 9;</code>
@@ -606,7 +537,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasWikipediaLangCode() {
-    return ((bitField0_ & 0x00000080) != 0);
+    return ((bitField0_ & 0x00000040) != 0);
   }
   /**
    * <code>string wikipedia_lang_code = 10;</code>
@@ -652,7 +583,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasWebsiteUrl() {
-    return ((bitField0_ & 0x00000100) != 0);
+    return ((bitField0_ & 0x00000080) != 0);
   }
   /**
    * <code>string website_url = 11;</code>
@@ -698,7 +629,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasSupportUrl() {
-    return ((bitField0_ & 0x00000200) != 0);
+    return ((bitField0_ & 0x00000100) != 0);
   }
   /**
    * <code>string support_url = 12;</code>
@@ -744,7 +675,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasSupportPhone() {
-    return ((bitField0_ & 0x00000400) != 0);
+    return ((bitField0_ & 0x00000200) != 0);
   }
   /**
    * <code>string support_phone = 13;</code>
@@ -790,7 +721,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasFacebookAccount() {
-    return ((bitField0_ & 0x00000800) != 0);
+    return ((bitField0_ & 0x00000400) != 0);
   }
   /**
    * <code>string facebook_account = 14;</code>
@@ -836,7 +767,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasTwitterAccount() {
-    return ((bitField0_ & 0x00001000) != 0);
+    return ((bitField0_ & 0x00000800) != 0);
   }
   /**
    * <code>string twitter_account = 15;</code>
@@ -882,7 +813,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasWarrantyUrl() {
-    return ((bitField0_ & 0x00002000) != 0);
+    return ((bitField0_ & 0x00001000) != 0);
   }
   /**
    * <code>string warranty_url = 16;</code>
@@ -928,7 +859,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasWarrantyDirectUrl() {
-    return ((bitField0_ & 0x00004000) != 0);
+    return ((bitField0_ & 0x00002000) != 0);
   }
   /**
    * <code>string warranty_direct_url = 17;</code>
@@ -974,7 +905,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCommunityUrl() {
-    return ((bitField0_ & 0x00008000) != 0);
+    return ((bitField0_ & 0x00004000) != 0);
   }
   /**
    * <code>string community_url = 20;</code>
@@ -1020,7 +951,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLinkedinAccount() {
-    return ((bitField0_ & 0x00010000) != 0);
+    return ((bitField0_ & 0x00008000) != 0);
   }
   /**
    * <code>string linkedin_account = 21;</code>
@@ -1066,7 +997,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasInstagramAccount() {
-    return ((bitField0_ & 0x00020000) != 0);
+    return ((bitField0_ & 0x00010000) != 0);
   }
   /**
    * <code>string instagram_account = 22;</code>
@@ -1112,7 +1043,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasYoutubeAccount() {
-    return ((bitField0_ & 0x00040000) != 0);
+    return ((bitField0_ & 0x00020000) != 0);
   }
   /**
    * <code>string youtube_account = 23;</code>
@@ -1158,7 +1089,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPinterestAccount() {
-    return ((bitField0_ & 0x00080000) != 0);
+    return ((bitField0_ & 0x00040000) != 0);
   }
   /**
    * <code>string pinterest_account = 24;</code>
@@ -1204,7 +1135,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasClassHardware() {
-    return ((bitField0_ & 0x00100000) != 0);
+    return ((bitField0_ & 0x00080000) != 0);
   }
   /**
    * <code>bool class_hardware = 25;</code>
@@ -1223,7 +1154,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasClassSoftware() {
-    return ((bitField0_ & 0x00200000) != 0);
+    return ((bitField0_ & 0x00100000) != 0);
   }
   /**
    * <code>bool class_software = 26;</code>
@@ -1242,7 +1173,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasClassConsumer() {
-    return ((bitField0_ & 0x00400000) != 0);
+    return ((bitField0_ & 0x00200000) != 0);
   }
   /**
    * <code>bool class_consumer = 27;</code>
@@ -1261,7 +1192,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasClassEnterprise() {
-    return ((bitField0_ & 0x00800000) != 0);
+    return ((bitField0_ & 0x00400000) != 0);
   }
   /**
    * <code>bool class_enterprise = 28;</code>
@@ -1280,7 +1211,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasClassIndustrial() {
-    return ((bitField0_ & 0x01000000) != 0);
+    return ((bitField0_ & 0x00800000) != 0);
   }
   /**
    * <code>bool class_industrial = 29;</code>
@@ -1299,7 +1230,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasClassIndividual() {
-    return ((bitField0_ & 0x02000000) != 0);
+    return ((bitField0_ & 0x01000000) != 0);
   }
   /**
    * <code>bool class_individual = 30;</code>
@@ -1322,7 +1253,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasMatchScore() {
-    return ((bitField0_ & 0x04000000) != 0);
+    return ((bitField0_ & 0x02000000) != 0);
   }
   /**
    * <pre>
@@ -1354,91 +1285,85 @@ private static final long serialVersionUID = 0L;
     if (id_ != 0L) {
       output.writeInt64(1, id_);
     }
-    if (!getMakeKeyBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, makeKey_);
-    }
     if (!getMakeNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, makeName_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
-      output.writeInt64(4, overrideId_);
-    }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeInt64(5, lastUpdateTime_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, countryCode_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, logoImageUrl_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, bannerImageUrl_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, wikipediaId_);
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 10, wikipediaLangCode_);
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (((bitField0_ & 0x00000080) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 11, websiteUrl_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (((bitField0_ & 0x00000100) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, supportUrl_);
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (((bitField0_ & 0x00000200) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 13, supportPhone_);
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (((bitField0_ & 0x00000400) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 14, facebookAccount_);
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (((bitField0_ & 0x00000800) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 15, twitterAccount_);
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (((bitField0_ & 0x00001000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 16, warrantyUrl_);
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (((bitField0_ & 0x00002000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 17, warrantyDirectUrl_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       output.writeInt64(18, parentId_);
     }
-    if (((bitField0_ & 0x04000000) != 0)) {
+    if (((bitField0_ & 0x02000000) != 0)) {
       output.writeInt32(19, matchScore_);
     }
-    if (((bitField0_ & 0x00008000) != 0)) {
+    if (((bitField0_ & 0x00004000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 20, communityUrl_);
     }
-    if (((bitField0_ & 0x00010000) != 0)) {
+    if (((bitField0_ & 0x00008000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 21, linkedinAccount_);
     }
-    if (((bitField0_ & 0x00020000) != 0)) {
+    if (((bitField0_ & 0x00010000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 22, instagramAccount_);
     }
-    if (((bitField0_ & 0x00040000) != 0)) {
+    if (((bitField0_ & 0x00020000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 23, youtubeAccount_);
     }
-    if (((bitField0_ & 0x00080000) != 0)) {
+    if (((bitField0_ & 0x00040000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 24, pinterestAccount_);
     }
-    if (((bitField0_ & 0x00100000) != 0)) {
+    if (((bitField0_ & 0x00080000) != 0)) {
       output.writeBool(25, classHardware_);
     }
-    if (((bitField0_ & 0x00200000) != 0)) {
+    if (((bitField0_ & 0x00100000) != 0)) {
       output.writeBool(26, classSoftware_);
     }
-    if (((bitField0_ & 0x00400000) != 0)) {
+    if (((bitField0_ & 0x00200000) != 0)) {
       output.writeBool(27, classConsumer_);
     }
-    if (((bitField0_ & 0x00800000) != 0)) {
+    if (((bitField0_ & 0x00400000) != 0)) {
       output.writeBool(28, classEnterprise_);
     }
-    if (((bitField0_ & 0x01000000) != 0)) {
+    if (((bitField0_ & 0x00800000) != 0)) {
       output.writeBool(29, classIndustrial_);
     }
-    if (((bitField0_ & 0x02000000) != 0)) {
+    if (((bitField0_ & 0x01000000) != 0)) {
       output.writeBool(30, classIndividual_);
     }
     unknownFields.writeTo(output);
@@ -1454,100 +1379,93 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(1, id_);
     }
-    if (!getMakeKeyBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, makeKey_);
-    }
     if (!getMakeNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, makeName_);
     }
-    if (((bitField0_ & 0x00000001) != 0)) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(4, overrideId_);
-    }
-    if (((bitField0_ & 0x00000004) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(5, lastUpdateTime_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, countryCode_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, logoImageUrl_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, bannerImageUrl_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, wikipediaId_);
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, wikipediaLangCode_);
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (((bitField0_ & 0x00000080) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, websiteUrl_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (((bitField0_ & 0x00000100) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, supportUrl_);
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (((bitField0_ & 0x00000200) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, supportPhone_);
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (((bitField0_ & 0x00000400) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, facebookAccount_);
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (((bitField0_ & 0x00000800) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, twitterAccount_);
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (((bitField0_ & 0x00001000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(16, warrantyUrl_);
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (((bitField0_ & 0x00002000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, warrantyDirectUrl_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(18, parentId_);
     }
-    if (((bitField0_ & 0x04000000) != 0)) {
+    if (((bitField0_ & 0x02000000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(19, matchScore_);
     }
-    if (((bitField0_ & 0x00008000) != 0)) {
+    if (((bitField0_ & 0x00004000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(20, communityUrl_);
     }
-    if (((bitField0_ & 0x00010000) != 0)) {
+    if (((bitField0_ & 0x00008000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(21, linkedinAccount_);
     }
-    if (((bitField0_ & 0x00020000) != 0)) {
+    if (((bitField0_ & 0x00010000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(22, instagramAccount_);
     }
-    if (((bitField0_ & 0x00040000) != 0)) {
+    if (((bitField0_ & 0x00020000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(23, youtubeAccount_);
     }
-    if (((bitField0_ & 0x00080000) != 0)) {
+    if (((bitField0_ & 0x00040000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(24, pinterestAccount_);
     }
-    if (((bitField0_ & 0x00100000) != 0)) {
+    if (((bitField0_ & 0x00080000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(25, classHardware_);
     }
-    if (((bitField0_ & 0x00200000) != 0)) {
+    if (((bitField0_ & 0x00100000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(26, classSoftware_);
     }
-    if (((bitField0_ & 0x00400000) != 0)) {
+    if (((bitField0_ & 0x00200000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(27, classConsumer_);
     }
-    if (((bitField0_ & 0x00800000) != 0)) {
+    if (((bitField0_ & 0x00400000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(28, classEnterprise_);
     }
-    if (((bitField0_ & 0x01000000) != 0)) {
+    if (((bitField0_ & 0x00800000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(29, classIndustrial_);
     }
-    if (((bitField0_ & 0x02000000) != 0)) {
+    if (((bitField0_ & 0x01000000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(30, classIndividual_);
     }
@@ -1568,15 +1486,8 @@ private static final long serialVersionUID = 0L;
 
     if (getId()
         != other.getId()) return false;
-    if (!getMakeKey()
-        .equals(other.getMakeKey())) return false;
     if (!getMakeName()
         .equals(other.getMakeName())) return false;
-    if (hasOverrideId() != other.hasOverrideId()) return false;
-    if (hasOverrideId()) {
-      if (getOverrideId()
-          != other.getOverrideId()) return false;
-    }
     if (hasParentId() != other.hasParentId()) return false;
     if (hasParentId()) {
       if (getParentId()
@@ -1721,15 +1632,8 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + ID_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getId());
-    hash = (37 * hash) + MAKE_KEY_FIELD_NUMBER;
-    hash = (53 * hash) + getMakeKey().hashCode();
     hash = (37 * hash) + MAKE_NAME_FIELD_NUMBER;
     hash = (53 * hash) + getMakeName().hashCode();
-    if (hasOverrideId()) {
-      hash = (37 * hash) + OVERRIDE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getOverrideId());
-    }
     if (hasParentId()) {
       hash = (37 * hash) + PARENT_ID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
@@ -1977,64 +1881,60 @@ private static final long serialVersionUID = 0L;
       super.clear();
       id_ = 0L;
 
-      makeKey_ = "";
-
       makeName_ = "";
 
-      overrideId_ = 0L;
-      bitField0_ = (bitField0_ & ~0x00000001);
       parentId_ = 0L;
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       lastUpdateTime_ = 0L;
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000002);
       countryCode_ = "";
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000004);
       logoImageUrl_ = "";
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00000008);
       bannerImageUrl_ = "";
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000010);
       wikipediaId_ = "";
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000020);
       wikipediaLangCode_ = "";
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00000040);
       websiteUrl_ = "";
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000080);
       supportUrl_ = "";
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000100);
       supportPhone_ = "";
-      bitField0_ = (bitField0_ & ~0x00000400);
+      bitField0_ = (bitField0_ & ~0x00000200);
       facebookAccount_ = "";
-      bitField0_ = (bitField0_ & ~0x00000800);
+      bitField0_ = (bitField0_ & ~0x00000400);
       twitterAccount_ = "";
-      bitField0_ = (bitField0_ & ~0x00001000);
+      bitField0_ = (bitField0_ & ~0x00000800);
       warrantyUrl_ = "";
-      bitField0_ = (bitField0_ & ~0x00002000);
+      bitField0_ = (bitField0_ & ~0x00001000);
       warrantyDirectUrl_ = "";
-      bitField0_ = (bitField0_ & ~0x00004000);
+      bitField0_ = (bitField0_ & ~0x00002000);
       communityUrl_ = "";
-      bitField0_ = (bitField0_ & ~0x00008000);
+      bitField0_ = (bitField0_ & ~0x00004000);
       linkedinAccount_ = "";
-      bitField0_ = (bitField0_ & ~0x00010000);
+      bitField0_ = (bitField0_ & ~0x00008000);
       instagramAccount_ = "";
-      bitField0_ = (bitField0_ & ~0x00020000);
+      bitField0_ = (bitField0_ & ~0x00010000);
       youtubeAccount_ = "";
-      bitField0_ = (bitField0_ & ~0x00040000);
+      bitField0_ = (bitField0_ & ~0x00020000);
       pinterestAccount_ = "";
-      bitField0_ = (bitField0_ & ~0x00080000);
+      bitField0_ = (bitField0_ & ~0x00040000);
       classHardware_ = false;
-      bitField0_ = (bitField0_ & ~0x00100000);
+      bitField0_ = (bitField0_ & ~0x00080000);
       classSoftware_ = false;
-      bitField0_ = (bitField0_ & ~0x00200000);
+      bitField0_ = (bitField0_ & ~0x00100000);
       classConsumer_ = false;
-      bitField0_ = (bitField0_ & ~0x00400000);
+      bitField0_ = (bitField0_ & ~0x00200000);
       classEnterprise_ = false;
-      bitField0_ = (bitField0_ & ~0x00800000);
+      bitField0_ = (bitField0_ & ~0x00400000);
       classIndustrial_ = false;
-      bitField0_ = (bitField0_ & ~0x01000000);
+      bitField0_ = (bitField0_ & ~0x00800000);
       classIndividual_ = false;
-      bitField0_ = (bitField0_ & ~0x02000000);
+      bitField0_ = (bitField0_ & ~0x01000000);
       matchScore_ = 0;
-      bitField0_ = (bitField0_ & ~0x04000000);
+      bitField0_ = (bitField0_ & ~0x02000000);
       return this;
     }
 
@@ -2064,115 +1964,110 @@ private static final long serialVersionUID = 0L;
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.id_ = id_;
-      result.makeKey_ = makeKey_;
       result.makeName_ = makeName_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
-        result.overrideId_ = overrideId_;
+        result.parentId_ = parentId_;
         to_bitField0_ |= 0x00000001;
       }
       if (((from_bitField0_ & 0x00000002) != 0)) {
-        result.parentId_ = parentId_;
+        result.lastUpdateTime_ = lastUpdateTime_;
         to_bitField0_ |= 0x00000002;
       }
       if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.lastUpdateTime_ = lastUpdateTime_;
         to_bitField0_ |= 0x00000004;
       }
+      result.countryCode_ = countryCode_;
       if (((from_bitField0_ & 0x00000008) != 0)) {
         to_bitField0_ |= 0x00000008;
       }
-      result.countryCode_ = countryCode_;
+      result.logoImageUrl_ = logoImageUrl_;
       if (((from_bitField0_ & 0x00000010) != 0)) {
         to_bitField0_ |= 0x00000010;
       }
-      result.logoImageUrl_ = logoImageUrl_;
+      result.bannerImageUrl_ = bannerImageUrl_;
       if (((from_bitField0_ & 0x00000020) != 0)) {
         to_bitField0_ |= 0x00000020;
       }
-      result.bannerImageUrl_ = bannerImageUrl_;
+      result.wikipediaId_ = wikipediaId_;
       if (((from_bitField0_ & 0x00000040) != 0)) {
         to_bitField0_ |= 0x00000040;
       }
-      result.wikipediaId_ = wikipediaId_;
+      result.wikipediaLangCode_ = wikipediaLangCode_;
       if (((from_bitField0_ & 0x00000080) != 0)) {
         to_bitField0_ |= 0x00000080;
       }
-      result.wikipediaLangCode_ = wikipediaLangCode_;
+      result.websiteUrl_ = websiteUrl_;
       if (((from_bitField0_ & 0x00000100) != 0)) {
         to_bitField0_ |= 0x00000100;
       }
-      result.websiteUrl_ = websiteUrl_;
+      result.supportUrl_ = supportUrl_;
       if (((from_bitField0_ & 0x00000200) != 0)) {
         to_bitField0_ |= 0x00000200;
       }
-      result.supportUrl_ = supportUrl_;
+      result.supportPhone_ = supportPhone_;
       if (((from_bitField0_ & 0x00000400) != 0)) {
         to_bitField0_ |= 0x00000400;
       }
-      result.supportPhone_ = supportPhone_;
+      result.facebookAccount_ = facebookAccount_;
       if (((from_bitField0_ & 0x00000800) != 0)) {
         to_bitField0_ |= 0x00000800;
       }
-      result.facebookAccount_ = facebookAccount_;
+      result.twitterAccount_ = twitterAccount_;
       if (((from_bitField0_ & 0x00001000) != 0)) {
         to_bitField0_ |= 0x00001000;
       }
-      result.twitterAccount_ = twitterAccount_;
+      result.warrantyUrl_ = warrantyUrl_;
       if (((from_bitField0_ & 0x00002000) != 0)) {
         to_bitField0_ |= 0x00002000;
       }
-      result.warrantyUrl_ = warrantyUrl_;
+      result.warrantyDirectUrl_ = warrantyDirectUrl_;
       if (((from_bitField0_ & 0x00004000) != 0)) {
         to_bitField0_ |= 0x00004000;
       }
-      result.warrantyDirectUrl_ = warrantyDirectUrl_;
+      result.communityUrl_ = communityUrl_;
       if (((from_bitField0_ & 0x00008000) != 0)) {
         to_bitField0_ |= 0x00008000;
       }
-      result.communityUrl_ = communityUrl_;
+      result.linkedinAccount_ = linkedinAccount_;
       if (((from_bitField0_ & 0x00010000) != 0)) {
         to_bitField0_ |= 0x00010000;
       }
-      result.linkedinAccount_ = linkedinAccount_;
+      result.instagramAccount_ = instagramAccount_;
       if (((from_bitField0_ & 0x00020000) != 0)) {
         to_bitField0_ |= 0x00020000;
       }
-      result.instagramAccount_ = instagramAccount_;
+      result.youtubeAccount_ = youtubeAccount_;
       if (((from_bitField0_ & 0x00040000) != 0)) {
         to_bitField0_ |= 0x00040000;
       }
-      result.youtubeAccount_ = youtubeAccount_;
+      result.pinterestAccount_ = pinterestAccount_;
       if (((from_bitField0_ & 0x00080000) != 0)) {
+        result.classHardware_ = classHardware_;
         to_bitField0_ |= 0x00080000;
       }
-      result.pinterestAccount_ = pinterestAccount_;
       if (((from_bitField0_ & 0x00100000) != 0)) {
-        result.classHardware_ = classHardware_;
+        result.classSoftware_ = classSoftware_;
         to_bitField0_ |= 0x00100000;
       }
       if (((from_bitField0_ & 0x00200000) != 0)) {
-        result.classSoftware_ = classSoftware_;
+        result.classConsumer_ = classConsumer_;
         to_bitField0_ |= 0x00200000;
       }
       if (((from_bitField0_ & 0x00400000) != 0)) {
-        result.classConsumer_ = classConsumer_;
+        result.classEnterprise_ = classEnterprise_;
         to_bitField0_ |= 0x00400000;
       }
       if (((from_bitField0_ & 0x00800000) != 0)) {
-        result.classEnterprise_ = classEnterprise_;
+        result.classIndustrial_ = classIndustrial_;
         to_bitField0_ |= 0x00800000;
       }
       if (((from_bitField0_ & 0x01000000) != 0)) {
-        result.classIndustrial_ = classIndustrial_;
+        result.classIndividual_ = classIndividual_;
         to_bitField0_ |= 0x01000000;
       }
       if (((from_bitField0_ & 0x02000000) != 0)) {
-        result.classIndividual_ = classIndividual_;
-        to_bitField0_ |= 0x02000000;
-      }
-      if (((from_bitField0_ & 0x04000000) != 0)) {
         result.matchScore_ = matchScore_;
-        to_bitField0_ |= 0x04000000;
+        to_bitField0_ |= 0x02000000;
       }
       result.bitField0_ = to_bitField0_;
       onBuilt();
@@ -2226,17 +2121,10 @@ private static final long serialVersionUID = 0L;
       if (other.getId() != 0L) {
         setId(other.getId());
       }
-      if (!other.getMakeKey().isEmpty()) {
-        makeKey_ = other.makeKey_;
-        onChanged();
-      }
       if (!other.getMakeName().isEmpty()) {
         makeName_ = other.makeName_;
         onChanged();
       }
-      if (other.hasOverrideId()) {
-        setOverrideId(other.getOverrideId());
-      }
       if (other.hasParentId()) {
         setParentId(other.getParentId());
       }
@@ -2244,87 +2132,87 @@ private static final long serialVersionUID = 0L;
         setLastUpdateTime(other.getLastUpdateTime());
       }
       if (other.hasCountryCode()) {
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000004;
         countryCode_ = other.countryCode_;
         onChanged();
       }
       if (other.hasLogoImageUrl()) {
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00000008;
         logoImageUrl_ = other.logoImageUrl_;
         onChanged();
       }
       if (other.hasBannerImageUrl()) {
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00000010;
         bannerImageUrl_ = other.bannerImageUrl_;
         onChanged();
       }
       if (other.hasWikipediaId()) {
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000020;
         wikipediaId_ = other.wikipediaId_;
         onChanged();
       }
       if (other.hasWikipediaLangCode()) {
-        bitField0_ |= 0x00000080;
+        bitField0_ |= 0x00000040;
         wikipediaLangCode_ = other.wikipediaLangCode_;
         onChanged();
       }
       if (other.hasWebsiteUrl()) {
-        bitField0_ |= 0x00000100;
+        bitField0_ |= 0x00000080;
         websiteUrl_ = other.websiteUrl_;
         onChanged();
       }
       if (other.hasSupportUrl()) {
-        bitField0_ |= 0x00000200;
+        bitField0_ |= 0x00000100;
         supportUrl_ = other.supportUrl_;
         onChanged();
       }
       if (other.hasSupportPhone()) {
-        bitField0_ |= 0x00000400;
+        bitField0_ |= 0x00000200;
         supportPhone_ = other.supportPhone_;
         onChanged();
       }
       if (other.hasFacebookAccount()) {
-        bitField0_ |= 0x00000800;
+        bitField0_ |= 0x00000400;
         facebookAccount_ = other.facebookAccount_;
         onChanged();
       }
       if (other.hasTwitterAccount()) {
-        bitField0_ |= 0x00001000;
+        bitField0_ |= 0x00000800;
         twitterAccount_ = other.twitterAccount_;
         onChanged();
       }
       if (other.hasWarrantyUrl()) {
-        bitField0_ |= 0x00002000;
+        bitField0_ |= 0x00001000;
         warrantyUrl_ = other.warrantyUrl_;
         onChanged();
       }
       if (other.hasWarrantyDirectUrl()) {
-        bitField0_ |= 0x00004000;
+        bitField0_ |= 0x00002000;
         warrantyDirectUrl_ = other.warrantyDirectUrl_;
         onChanged();
       }
       if (other.hasCommunityUrl()) {
-        bitField0_ |= 0x00008000;
+        bitField0_ |= 0x00004000;
         communityUrl_ = other.communityUrl_;
         onChanged();
       }
       if (other.hasLinkedinAccount()) {
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00008000;
         linkedinAccount_ = other.linkedinAccount_;
         onChanged();
       }
       if (other.hasInstagramAccount()) {
-        bitField0_ |= 0x00020000;
+        bitField0_ |= 0x00010000;
         instagramAccount_ = other.instagramAccount_;
         onChanged();
       }
       if (other.hasYoutubeAccount()) {
-        bitField0_ |= 0x00040000;
+        bitField0_ |= 0x00020000;
         youtubeAccount_ = other.youtubeAccount_;
         onChanged();
       }
       if (other.hasPinterestAccount()) {
-        bitField0_ |= 0x00080000;
+        bitField0_ |= 0x00040000;
         pinterestAccount_ = other.pinterestAccount_;
         onChanged();
       }
@@ -2356,132 +2244,56 @@ private static final long serialVersionUID = 0L;
 
     @java.lang.Override
     public final boolean isInitialized() {
-      return true;
-    }
-
-    @java.lang.Override
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.lansweeper.dp.outbound.v1.CatalogBrand parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.lansweeper.dp.outbound.v1.CatalogBrand) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private long id_ ;
-    /**
-     * <code>int64 id = 1;</code>
-     * @return The id.
-     */
-    @java.lang.Override
-    public long getId() {
-      return id_;
-    }
-    /**
-     * <code>int64 id = 1;</code>
-     * @param value The id to set.
-     * @return This builder for chaining.
-     */
-    public Builder setId(long value) {
-      
-      id_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>int64 id = 1;</code>
-     * @return This builder for chaining.
-     */
-    public Builder clearId() {
-      
-      id_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object makeKey_ = "";
-    /**
-     * <code>string make_key = 2;</code>
-     * @return The makeKey.
-     */
-    public java.lang.String getMakeKey() {
-      java.lang.Object ref = makeKey_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        makeKey_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string make_key = 2;</code>
-     * @return The bytes for makeKey.
-     */
-    public com.google.protobuf.ByteString
-        getMakeKeyBytes() {
-      java.lang.Object ref = makeKey_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        makeKey_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.lansweeper.dp.outbound.v1.CatalogBrand parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.lansweeper.dp.outbound.v1.CatalogBrand) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
       }
+      return this;
     }
+    private int bitField0_;
+
+    private long id_ ;
     /**
-     * <code>string make_key = 2;</code>
-     * @param value The makeKey to set.
-     * @return This builder for chaining.
+     * <code>int64 id = 1;</code>
+     * @return The id.
      */
-    public Builder setMakeKey(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      makeKey_ = value;
-      onChanged();
-      return this;
+    @java.lang.Override
+    public long getId() {
+      return id_;
     }
     /**
-     * <code>string make_key = 2;</code>
+     * <code>int64 id = 1;</code>
+     * @param value The id to set.
      * @return This builder for chaining.
      */
-    public Builder clearMakeKey() {
+    public Builder setId(long value) {
       
-      makeKey_ = getDefaultInstance().getMakeKey();
+      id_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>string make_key = 2;</code>
-     * @param value The bytes for makeKey to set.
+     * <code>int64 id = 1;</code>
      * @return This builder for chaining.
      */
-    public Builder setMakeKeyBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
+    public Builder clearId() {
       
-      makeKey_ = value;
+      id_ = 0L;
       onChanged();
       return this;
     }
@@ -2562,45 +2374,6 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    private long overrideId_ ;
-    /**
-     * <code>int64 override_id = 4;</code>
-     * @return Whether the overrideId field is set.
-     */
-    @java.lang.Override
-    public boolean hasOverrideId() {
-      return ((bitField0_ & 0x00000001) != 0);
-    }
-    /**
-     * <code>int64 override_id = 4;</code>
-     * @return The overrideId.
-     */
-    @java.lang.Override
-    public long getOverrideId() {
-      return overrideId_;
-    }
-    /**
-     * <code>int64 override_id = 4;</code>
-     * @param value The overrideId to set.
-     * @return This builder for chaining.
-     */
-    public Builder setOverrideId(long value) {
-      bitField0_ |= 0x00000001;
-      overrideId_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>int64 override_id = 4;</code>
-     * @return This builder for chaining.
-     */
-    public Builder clearOverrideId() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      overrideId_ = 0L;
-      onChanged();
-      return this;
-    }
-
     private long parentId_ ;
     /**
      * <code>int64 parent_id = 18;</code>
@@ -2608,7 +2381,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasParentId() {
-      return ((bitField0_ & 0x00000002) != 0);
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <code>int64 parent_id = 18;</code>
@@ -2624,7 +2397,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setParentId(long value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       parentId_ = value;
       onChanged();
       return this;
@@ -2634,7 +2407,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearParentId() {
-      bitField0_ = (bitField0_ & ~0x00000002);
+      bitField0_ = (bitField0_ & ~0x00000001);
       parentId_ = 0L;
       onChanged();
       return this;
@@ -2647,7 +2420,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasLastUpdateTime() {
-      return ((bitField0_ & 0x00000004) != 0);
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <code>int64 last_update_time = 5;</code>
@@ -2663,7 +2436,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setLastUpdateTime(long value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       lastUpdateTime_ = value;
       onChanged();
       return this;
@@ -2673,7 +2446,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearLastUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00000004);
+      bitField0_ = (bitField0_ & ~0x00000002);
       lastUpdateTime_ = 0L;
       onChanged();
       return this;
@@ -2685,7 +2458,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the countryCode field is set.
      */
     public boolean hasCountryCode() {
-      return ((bitField0_ & 0x00000008) != 0);
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      * <code>string country_code = 6;</code>
@@ -2730,7 +2503,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000008;
+  bitField0_ |= 0x00000004;
       countryCode_ = value;
       onChanged();
       return this;
@@ -2740,7 +2513,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearCountryCode() {
-      bitField0_ = (bitField0_ & ~0x00000008);
+      bitField0_ = (bitField0_ & ~0x00000004);
       countryCode_ = getDefaultInstance().getCountryCode();
       onChanged();
       return this;
@@ -2756,7 +2529,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       countryCode_ = value;
       onChanged();
       return this;
@@ -2768,7 +2541,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the logoImageUrl field is set.
      */
     public boolean hasLogoImageUrl() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      * <code>string logo_image_url = 7;</code>
@@ -2813,7 +2586,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000010;
+  bitField0_ |= 0x00000008;
       logoImageUrl_ = value;
       onChanged();
       return this;
@@ -2823,7 +2596,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearLogoImageUrl() {
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00000008);
       logoImageUrl_ = getDefaultInstance().getLogoImageUrl();
       onChanged();
       return this;
@@ -2839,7 +2612,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000008;
       logoImageUrl_ = value;
       onChanged();
       return this;
@@ -2851,7 +2624,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the bannerImageUrl field is set.
      */
     public boolean hasBannerImageUrl() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      * <code>string banner_image_url = 8;</code>
@@ -2896,7 +2669,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000020;
+  bitField0_ |= 0x00000010;
       bannerImageUrl_ = value;
       onChanged();
       return this;
@@ -2906,7 +2679,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearBannerImageUrl() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000010);
       bannerImageUrl_ = getDefaultInstance().getBannerImageUrl();
       onChanged();
       return this;
@@ -2922,7 +2695,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000010;
       bannerImageUrl_ = value;
       onChanged();
       return this;
@@ -2934,7 +2707,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the wikipediaId field is set.
      */
     public boolean hasWikipediaId() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      * <code>string wikipedia_id = 9;</code>
@@ -2979,7 +2752,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000040;
+  bitField0_ |= 0x00000020;
       wikipediaId_ = value;
       onChanged();
       return this;
@@ -2989,7 +2762,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearWikipediaId() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000020);
       wikipediaId_ = getDefaultInstance().getWikipediaId();
       onChanged();
       return this;
@@ -3005,7 +2778,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000020;
       wikipediaId_ = value;
       onChanged();
       return this;
@@ -3017,7 +2790,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the wikipediaLangCode field is set.
      */
     public boolean hasWikipediaLangCode() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      * <code>string wikipedia_lang_code = 10;</code>
@@ -3062,7 +2835,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000080;
+  bitField0_ |= 0x00000040;
       wikipediaLangCode_ = value;
       onChanged();
       return this;
@@ -3072,7 +2845,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearWikipediaLangCode() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00000040);
       wikipediaLangCode_ = getDefaultInstance().getWikipediaLangCode();
       onChanged();
       return this;
@@ -3088,7 +2861,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000040;
       wikipediaLangCode_ = value;
       onChanged();
       return this;
@@ -3100,7 +2873,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the websiteUrl field is set.
      */
     public boolean hasWebsiteUrl() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      * <code>string website_url = 11;</code>
@@ -3145,7 +2918,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000100;
+  bitField0_ |= 0x00000080;
       websiteUrl_ = value;
       onChanged();
       return this;
@@ -3155,7 +2928,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearWebsiteUrl() {
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000080);
       websiteUrl_ = getDefaultInstance().getWebsiteUrl();
       onChanged();
       return this;
@@ -3171,7 +2944,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000100;
+      bitField0_ |= 0x00000080;
       websiteUrl_ = value;
       onChanged();
       return this;
@@ -3183,7 +2956,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the supportUrl field is set.
      */
     public boolean hasSupportUrl() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      * <code>string support_url = 12;</code>
@@ -3228,7 +3001,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000200;
+  bitField0_ |= 0x00000100;
       supportUrl_ = value;
       onChanged();
       return this;
@@ -3238,7 +3011,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearSupportUrl() {
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000100);
       supportUrl_ = getDefaultInstance().getSupportUrl();
       onChanged();
       return this;
@@ -3254,7 +3027,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000100;
       supportUrl_ = value;
       onChanged();
       return this;
@@ -3266,7 +3039,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the supportPhone field is set.
      */
     public boolean hasSupportPhone() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      * <code>string support_phone = 13;</code>
@@ -3311,7 +3084,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000400;
+  bitField0_ |= 0x00000200;
       supportPhone_ = value;
       onChanged();
       return this;
@@ -3321,7 +3094,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearSupportPhone() {
-      bitField0_ = (bitField0_ & ~0x00000400);
+      bitField0_ = (bitField0_ & ~0x00000200);
       supportPhone_ = getDefaultInstance().getSupportPhone();
       onChanged();
       return this;
@@ -3337,7 +3110,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000400;
+      bitField0_ |= 0x00000200;
       supportPhone_ = value;
       onChanged();
       return this;
@@ -3349,7 +3122,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the facebookAccount field is set.
      */
     public boolean hasFacebookAccount() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      * <code>string facebook_account = 14;</code>
@@ -3394,7 +3167,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000800;
+  bitField0_ |= 0x00000400;
       facebookAccount_ = value;
       onChanged();
       return this;
@@ -3404,7 +3177,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearFacebookAccount() {
-      bitField0_ = (bitField0_ & ~0x00000800);
+      bitField0_ = (bitField0_ & ~0x00000400);
       facebookAccount_ = getDefaultInstance().getFacebookAccount();
       onChanged();
       return this;
@@ -3420,7 +3193,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00000400;
       facebookAccount_ = value;
       onChanged();
       return this;
@@ -3432,7 +3205,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the twitterAccount field is set.
      */
     public boolean hasTwitterAccount() {
-      return ((bitField0_ & 0x00001000) != 0);
+      return ((bitField0_ & 0x00000800) != 0);
     }
     /**
      * <code>string twitter_account = 15;</code>
@@ -3477,7 +3250,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00001000;
+  bitField0_ |= 0x00000800;
       twitterAccount_ = value;
       onChanged();
       return this;
@@ -3487,7 +3260,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearTwitterAccount() {
-      bitField0_ = (bitField0_ & ~0x00001000);
+      bitField0_ = (bitField0_ & ~0x00000800);
       twitterAccount_ = getDefaultInstance().getTwitterAccount();
       onChanged();
       return this;
@@ -3503,7 +3276,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00001000;
+      bitField0_ |= 0x00000800;
       twitterAccount_ = value;
       onChanged();
       return this;
@@ -3515,7 +3288,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the warrantyUrl field is set.
      */
     public boolean hasWarrantyUrl() {
-      return ((bitField0_ & 0x00002000) != 0);
+      return ((bitField0_ & 0x00001000) != 0);
     }
     /**
      * <code>string warranty_url = 16;</code>
@@ -3560,7 +3333,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00002000;
+  bitField0_ |= 0x00001000;
       warrantyUrl_ = value;
       onChanged();
       return this;
@@ -3570,7 +3343,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearWarrantyUrl() {
-      bitField0_ = (bitField0_ & ~0x00002000);
+      bitField0_ = (bitField0_ & ~0x00001000);
       warrantyUrl_ = getDefaultInstance().getWarrantyUrl();
       onChanged();
       return this;
@@ -3586,7 +3359,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00002000;
+      bitField0_ |= 0x00001000;
       warrantyUrl_ = value;
       onChanged();
       return this;
@@ -3598,7 +3371,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the warrantyDirectUrl field is set.
      */
     public boolean hasWarrantyDirectUrl() {
-      return ((bitField0_ & 0x00004000) != 0);
+      return ((bitField0_ & 0x00002000) != 0);
     }
     /**
      * <code>string warranty_direct_url = 17;</code>
@@ -3643,7 +3416,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00004000;
+  bitField0_ |= 0x00002000;
       warrantyDirectUrl_ = value;
       onChanged();
       return this;
@@ -3653,7 +3426,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearWarrantyDirectUrl() {
-      bitField0_ = (bitField0_ & ~0x00004000);
+      bitField0_ = (bitField0_ & ~0x00002000);
       warrantyDirectUrl_ = getDefaultInstance().getWarrantyDirectUrl();
       onChanged();
       return this;
@@ -3669,7 +3442,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00004000;
+      bitField0_ |= 0x00002000;
       warrantyDirectUrl_ = value;
       onChanged();
       return this;
@@ -3681,7 +3454,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the communityUrl field is set.
      */
     public boolean hasCommunityUrl() {
-      return ((bitField0_ & 0x00008000) != 0);
+      return ((bitField0_ & 0x00004000) != 0);
     }
     /**
      * <code>string community_url = 20;</code>
@@ -3726,7 +3499,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00008000;
+  bitField0_ |= 0x00004000;
       communityUrl_ = value;
       onChanged();
       return this;
@@ -3736,7 +3509,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearCommunityUrl() {
-      bitField0_ = (bitField0_ & ~0x00008000);
+      bitField0_ = (bitField0_ & ~0x00004000);
       communityUrl_ = getDefaultInstance().getCommunityUrl();
       onChanged();
       return this;
@@ -3752,7 +3525,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00008000;
+      bitField0_ |= 0x00004000;
       communityUrl_ = value;
       onChanged();
       return this;
@@ -3764,7 +3537,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the linkedinAccount field is set.
      */
     public boolean hasLinkedinAccount() {
-      return ((bitField0_ & 0x00010000) != 0);
+      return ((bitField0_ & 0x00008000) != 0);
     }
     /**
      * <code>string linkedin_account = 21;</code>
@@ -3809,7 +3582,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00010000;
+  bitField0_ |= 0x00008000;
       linkedinAccount_ = value;
       onChanged();
       return this;
@@ -3819,7 +3592,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearLinkedinAccount() {
-      bitField0_ = (bitField0_ & ~0x00010000);
+      bitField0_ = (bitField0_ & ~0x00008000);
       linkedinAccount_ = getDefaultInstance().getLinkedinAccount();
       onChanged();
       return this;
@@ -3835,7 +3608,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00010000;
+      bitField0_ |= 0x00008000;
       linkedinAccount_ = value;
       onChanged();
       return this;
@@ -3847,7 +3620,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the instagramAccount field is set.
      */
     public boolean hasInstagramAccount() {
-      return ((bitField0_ & 0x00020000) != 0);
+      return ((bitField0_ & 0x00010000) != 0);
     }
     /**
      * <code>string instagram_account = 22;</code>
@@ -3892,7 +3665,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00020000;
+  bitField0_ |= 0x00010000;
       instagramAccount_ = value;
       onChanged();
       return this;
@@ -3902,7 +3675,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearInstagramAccount() {
-      bitField0_ = (bitField0_ & ~0x00020000);
+      bitField0_ = (bitField0_ & ~0x00010000);
       instagramAccount_ = getDefaultInstance().getInstagramAccount();
       onChanged();
       return this;
@@ -3918,7 +3691,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00020000;
+      bitField0_ |= 0x00010000;
       instagramAccount_ = value;
       onChanged();
       return this;
@@ -3930,7 +3703,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the youtubeAccount field is set.
      */
     public boolean hasYoutubeAccount() {
-      return ((bitField0_ & 0x00040000) != 0);
+      return ((bitField0_ & 0x00020000) != 0);
     }
     /**
      * <code>string youtube_account = 23;</code>
@@ -3975,7 +3748,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00040000;
+  bitField0_ |= 0x00020000;
       youtubeAccount_ = value;
       onChanged();
       return this;
@@ -3985,7 +3758,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearYoutubeAccount() {
-      bitField0_ = (bitField0_ & ~0x00040000);
+      bitField0_ = (bitField0_ & ~0x00020000);
       youtubeAccount_ = getDefaultInstance().getYoutubeAccount();
       onChanged();
       return this;
@@ -4001,7 +3774,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00040000;
+      bitField0_ |= 0x00020000;
       youtubeAccount_ = value;
       onChanged();
       return this;
@@ -4013,7 +3786,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the pinterestAccount field is set.
      */
     public boolean hasPinterestAccount() {
-      return ((bitField0_ & 0x00080000) != 0);
+      return ((bitField0_ & 0x00040000) != 0);
     }
     /**
      * <code>string pinterest_account = 24;</code>
@@ -4058,7 +3831,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00080000;
+  bitField0_ |= 0x00040000;
       pinterestAccount_ = value;
       onChanged();
       return this;
@@ -4068,7 +3841,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearPinterestAccount() {
-      bitField0_ = (bitField0_ & ~0x00080000);
+      bitField0_ = (bitField0_ & ~0x00040000);
       pinterestAccount_ = getDefaultInstance().getPinterestAccount();
       onChanged();
       return this;
@@ -4084,7 +3857,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00080000;
+      bitField0_ |= 0x00040000;
       pinterestAccount_ = value;
       onChanged();
       return this;
@@ -4097,7 +3870,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasClassHardware() {
-      return ((bitField0_ & 0x00100000) != 0);
+      return ((bitField0_ & 0x00080000) != 0);
     }
     /**
      * <code>bool class_hardware = 25;</code>
@@ -4113,7 +3886,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setClassHardware(boolean value) {
-      bitField0_ |= 0x00100000;
+      bitField0_ |= 0x00080000;
       classHardware_ = value;
       onChanged();
       return this;
@@ -4123,7 +3896,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearClassHardware() {
-      bitField0_ = (bitField0_ & ~0x00100000);
+      bitField0_ = (bitField0_ & ~0x00080000);
       classHardware_ = false;
       onChanged();
       return this;
@@ -4136,7 +3909,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasClassSoftware() {
-      return ((bitField0_ & 0x00200000) != 0);
+      return ((bitField0_ & 0x00100000) != 0);
     }
     /**
      * <code>bool class_software = 26;</code>
@@ -4152,7 +3925,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setClassSoftware(boolean value) {
-      bitField0_ |= 0x00200000;
+      bitField0_ |= 0x00100000;
       classSoftware_ = value;
       onChanged();
       return this;
@@ -4162,7 +3935,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearClassSoftware() {
-      bitField0_ = (bitField0_ & ~0x00200000);
+      bitField0_ = (bitField0_ & ~0x00100000);
       classSoftware_ = false;
       onChanged();
       return this;
@@ -4175,7 +3948,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasClassConsumer() {
-      return ((bitField0_ & 0x00400000) != 0);
+      return ((bitField0_ & 0x00200000) != 0);
     }
     /**
      * <code>bool class_consumer = 27;</code>
@@ -4191,7 +3964,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setClassConsumer(boolean value) {
-      bitField0_ |= 0x00400000;
+      bitField0_ |= 0x00200000;
       classConsumer_ = value;
       onChanged();
       return this;
@@ -4201,7 +3974,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearClassConsumer() {
-      bitField0_ = (bitField0_ & ~0x00400000);
+      bitField0_ = (bitField0_ & ~0x00200000);
       classConsumer_ = false;
       onChanged();
       return this;
@@ -4214,7 +3987,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasClassEnterprise() {
-      return ((bitField0_ & 0x00800000) != 0);
+      return ((bitField0_ & 0x00400000) != 0);
     }
     /**
      * <code>bool class_enterprise = 28;</code>
@@ -4230,7 +4003,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setClassEnterprise(boolean value) {
-      bitField0_ |= 0x00800000;
+      bitField0_ |= 0x00400000;
       classEnterprise_ = value;
       onChanged();
       return this;
@@ -4240,7 +4013,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearClassEnterprise() {
-      bitField0_ = (bitField0_ & ~0x00800000);
+      bitField0_ = (bitField0_ & ~0x00400000);
       classEnterprise_ = false;
       onChanged();
       return this;
@@ -4253,7 +4026,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasClassIndustrial() {
-      return ((bitField0_ & 0x01000000) != 0);
+      return ((bitField0_ & 0x00800000) != 0);
     }
     /**
      * <code>bool class_industrial = 29;</code>
@@ -4269,7 +4042,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setClassIndustrial(boolean value) {
-      bitField0_ |= 0x01000000;
+      bitField0_ |= 0x00800000;
       classIndustrial_ = value;
       onChanged();
       return this;
@@ -4279,7 +4052,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearClassIndustrial() {
-      bitField0_ = (bitField0_ & ~0x01000000);
+      bitField0_ = (bitField0_ & ~0x00800000);
       classIndustrial_ = false;
       onChanged();
       return this;
@@ -4292,7 +4065,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasClassIndividual() {
-      return ((bitField0_ & 0x02000000) != 0);
+      return ((bitField0_ & 0x01000000) != 0);
     }
     /**
      * <code>bool class_individual = 30;</code>
@@ -4308,7 +4081,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setClassIndividual(boolean value) {
-      bitField0_ |= 0x02000000;
+      bitField0_ |= 0x01000000;
       classIndividual_ = value;
       onChanged();
       return this;
@@ -4318,7 +4091,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearClassIndividual() {
-      bitField0_ = (bitField0_ & ~0x02000000);
+      bitField0_ = (bitField0_ & ~0x01000000);
       classIndividual_ = false;
       onChanged();
       return this;
@@ -4335,7 +4108,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasMatchScore() {
-      return ((bitField0_ & 0x04000000) != 0);
+      return ((bitField0_ & 0x02000000) != 0);
     }
     /**
      * <pre>
@@ -4359,7 +4132,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setMatchScore(int value) {
-      bitField0_ |= 0x04000000;
+      bitField0_ |= 0x02000000;
       matchScore_ = value;
       onChanged();
       return this;
@@ -4373,7 +4146,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearMatchScore() {
-      bitField0_ = (bitField0_ & ~0x04000000);
+      bitField0_ = (bitField0_ & ~0x02000000);
       matchScore_ = 0;
       onChanged();
       return this;