Refactor: "resolve" conflicts with clojure.
Formatting