diff --git a/src/ring/swagger/json_schema.clj b/src/ring/swagger/json_schema.clj
index 2420091..eb69945 100644
--- a/src/ring/swagger/json_schema.clj
+++ b/src/ring/swagger/json_schema.clj
@@ -277,7 +277,6 @@
   The result is put into collection of same type as input schema.
   Thus linked/map should keep the order of items. Returns nil
   if no properties are found."
-<<<<<<< HEAD
   ([schema] (properties schema nil))
   ([schema opts]
    {:pre [(common/plain-map? schema)]}
@@ -285,23 +284,10 @@
                      (for [[k v] schema
                            :when (s/specific-key? k)
                            :let [key-meta (meta k)
-                                 k (s/explicit-schema-key k)]
-                           :let [v (try->swagger v k key-meta opts)]]
+                                 k (s/explicit-schema-key k)
+                                 v (try->swagger v k key-meta opts)]]
                        (and v [k v])))]
-     (if (seq props)
-       props))))
-=======
-  [schema]
-  {:pre [(common/plain-map? schema)]}
-  (let [props (into (empty schema)
-                    (for [[k v] schema
-                          :when (s/specific-key? k)
-                          :let [key-meta (meta k)
-                                k (s/explicit-schema-key k)
-                                v (try->swagger v k key-meta)]]
-                      (and v [k v])))]
-    (not-empty props)))
->>>>>>> master
+     (not-empty props))))
 
 (defn additional-properties
   "Generates json-schema additional properties from a plain map