merging w/ clojure project