Add some clojure stuff
Fixes conflicts