adds support for clojure
merging conflict