               :subcat '()}}]
    })
 
+
 (declare lexicon)
 
 ;; TODO: allow a filter of lexemes
-<<<<<<< Updated upstream
 (defn- deliver-lexicon []
   (-> (compile-lex lexicon-source 
                    morph/exception-generator 

                    {:english {:agr agr}
                     :synsem {:cat :noun
                              :agr agr}}))
<<<<<<< Updated upstream
      
      ;; A pronoun is either reflexive or not reflexive, but
      ;; a non-pronoun is never reflexive.

                                :sem obj-sem}
                            :2 '()}
                   :sem {:obj obj-sem}}}))
                 (default
                  {:synsem {:cat :verb
                            :subcat {:2 {:subcat '()}}}})
