update cider
clojure mode
fix merge conflict