diff --git a/latest.json b/latest.json
index 489e345..e525496 100644
--- a/latest.json
+++ b/latest.json
@@ -12,4 +12,4 @@
          "version":"2.2.4"
       }
    }
-}
+}
\ No newline at end of file
diff --git a/org/parabot/client/2.2.36/client-2.2.36.jar b/org/parabot/client/2.2.36/client-2.2.36.jar
new file mode 100644
index 0000000..815b2cd
Binary files /dev/null and b/org/parabot/client/2.2.36/client-2.2.36.jar differ
diff --git a/org/parabot/client/2.2.36/client-2.2.36.pom b/org/parabot/client/2.2.36/client-2.2.36.pom
new file mode 100644
index 0000000..aa5d1b8
--- /dev/null
+++ b/org/parabot/client/2.2.36/client-2.2.36.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.parabot</groupId>
+  <artifactId>client</artifactId>
+  <version>2.2.36</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/org/parabot/client/maven-metadata-local.xml b/org/parabot/client/maven-metadata-local.xml
index 722e1c3..e6029c8 100644
--- a/org/parabot/client/maven-metadata-local.xml
+++ b/org/parabot/client/maven-metadata-local.xml
@@ -3,15 +3,25 @@
   <groupId>org.parabot</groupId>
   <artifactId>client</artifactId>
   <versioning>
+<<<<<<< HEAD
     <release>2.2.4</release>
+=======
+    <release>2.2.36</release>
+>>>>>>> f4722e25ad51fbbffc6b30603ff6a066ccce9c8f
     <versions>
       <version>2.2</version>
       <version>2.2.32</version>
       <version>2.2.33</version>
       <version>2.2.34</version>
+<<<<<<< HEAD
       <version>2.2.35</version>
       <version>2.2.4</version>
     </versions>
     <lastUpdated>20150915182915</lastUpdated>
+=======
+      <version>2.2.36</version>
+    </versions>
+    <lastUpdated>20150915064745</lastUpdated>
+>>>>>>> f4722e25ad51fbbffc6b30603ff6a066ccce9c8f
   </versioning>
 </metadata>