diff --git a/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION b/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION
new file mode 100644
index 000000000000..f9f7450d1359
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION
@@ -0,0 +1 @@
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
index 5cd0f88eb5aa..1fbf625b4ecd 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -196,8 +196,6 @@ public class ApiClient {
         return this;
     }
 
-<<<<<<< HEAD
-=======
     public KeyManager[] getKeyManagers() {
         return keyManagers;
     }
@@ -219,7 +217,6 @@ public class ApiClient {
         return dateFormat;
     }
 
->>>>>>> origin/master
     public ApiClient setDateFormat(DateFormat dateFormat) {
         this.json.setDateFormat(dateFormat);
         return this;