Fix merge conflicts

Author: a-d

datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/FantaFlavor.java

@@ -6,7 +6,6 @@
  * SodaStore API
  * API for managing soda products and orders in SodaStore.
  *
- * The version of the OpenAPI document: 1.0.0
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/FantaFlavorOneOf.java

@@ -6,7 +6,6 @@
  * SodaStore API
  * API for managing soda products and orders in SodaStore.
  *
- * The version of the OpenAPI document: 1.0.0
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

datamodel/openapi/openapi-generator/src/test/resources/DataModelGeneratorIntegrationTest/oneof-interfaces-enabled/output/test/FantaFlavor.java

@@ -6,7 +6,6 @@
  * Soda Store API
  * API for managing sodas in a soda store
  *
- * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -33,13 +32,14 @@
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
+import com.google.common.annotations.Beta;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
  * FantaFlavor
  */
+@Beta
 public interface FantaFlavor  {
     /**
      * Helper class to create a Cola that implements {@link FantaFlavor}.