clojure 1.5.1 deps

fixed a broken test
resolve conflict