add clojure stuff
fix merge conflicts