Fixing git merge artefact

Author: msooseth

src/EVM/SMT.hs

@@ -1081,11 +1081,7 @@ parseTxCtx :: TS.Text -> Expr EWord
 parseTxCtx name
   | name == "txvalue" = TxValue
   | Just a <- TS.stripPrefix "balance_" name = Balance (parseEAddr a)
-<<<<<<< HEAD
-  | Just a <- TS.stripPrefix "gas_" name = Gas (textToInt a)
   | Just a <- TS.stripPrefix "codehash_" name = CodeHash (parseEAddr a)
-=======
->>>>>>> b044b99d (Fixing equivalence checking)
   | otherwise = internalError $ "cannot parse " <> (TS.unpack name) <> " into an Expr"
 
 getAddrs :: (TS.Text -> Expr EAddr) -> (Text -> IO Text) -> [TS.Text] -> IO (Map (Expr EAddr) Addr)