diff --git a/src/clj/auto_ap/ledger.clj b/src/clj/auto_ap/ledger.clj
index 435a8306..3eb9a3e9 100644
--- a/src/clj/auto_ap/ledger.clj
+++ b/src/clj/auto_ap/ledger.clj
@@ -8,9 +8,10 @@
    [com.brunobonacci.mulog :as mu]
    [com.unbounce.dogstatsd.core :as statsd]
    [datomic.api :as dc]
-   [iol-ion.query :refer [account-sets Line]]
+   [iol-ion.query :refer [account-sets]]
    [mount.core :as mount]
-   [yang.scheduler :as scheduler]))
+   [yang.scheduler :as scheduler])
+  (:import [iol_ion.query Line]))
 
 (defn reconcile-ledger
   ([] (reconcile-ledger (-> (t/now)
@@ -535,12 +536,7 @@
 
 (mark-all-clients-dirty)
 
-<<<<<<< HEAD
-
-(clients-needing-refresh (dc/db conn))
-=======
 (count (clients-needing-refresh (dc/db conn)))
->>>>>>> master
 
    (upsert-running-balance)