diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 07ae57756..f7f7874ce 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -2307,13 +2307,8 @@ int64_t komodo_pricecorrelated(uint64_t seed,int32_t ind,uint32_t *rawprices,int
     for (iter=0; iter<PRICES_DAYWINDOW; iter++)
     {
         correlation = 0;
-<<<<<<< HEAD
         i = (iter + seed) % PRICES_DAYWINDOW;
         refprice = rawprices[i*rawskip];
-=======
-        i = (iter + seed) % daywindow;
-        refprice = rawprices[i];
->>>>>>> FSM
         highprice = (refprice * (COIN + PRICES_MAXCHANGE*5)) / COIN;
         lowprice = (refprice * (COIN - PRICES_MAXCHANGE*5)) / COIN;
         if ( highprice == refprice )