merge
fix merge error & re-indent
conditional on Clojure mode