fix conflicts

marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Api.hs

@@ -43,7 +43,7 @@ import Control.Monad (guard, join, (<=<), (>=>))
 import Data.Aeson
   ( FromJSON(..)
   , FromJSONKey(..)
-  , FromJSONKeyFunction(FromJSONKeyTextParser)
+  , FromJSONKeyFunction(FromJSONKeyText, FromJSONKeyTextParser)
   , ToJSON
   , ToJSONKey
   , Value(..)
@@ -55,13 +55,6 @@ import qualified Data.Aeson as A
 import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.KeyMap as KeyMap
 import Data.Aeson.Types (parseFail, toJSONKeyText)
-import Control.Monad (guard, (>=>))
-import Data.Aeson
-  (FromJSON, FromJSONKey, FromJSONKeyFunction(FromJSONKeyText), ToJSON, ToJSONKey, Value(..), object, toJSON, (.=))
-import qualified Data.Aeson as A
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.KeyMap as KeyMap
-import Data.Aeson.Types (toJSONKeyText)
 import qualified Data.Aeson.Types as A
 import Data.Bifunctor (bimap)
 import Data.Binary (Binary(..), Get, Put, get, getWord8, put, putWord8)
@@ -386,9 +379,6 @@ instance ToJSON Base16 where
 instance ToJSONKey Base16 where
   toJSONKey = toJSONKeyText $ encodeBase16 . unBase16
 
-instance FromJSON Base16 where
-  parseJSON = Aeson.withText "Base16" (pure . fromString . T.unpack)
-
 newtype DatumHash = DatumHash { unDatumHash :: ByteString }
   deriving stock (Eq, Ord, Generic)
   deriving newtype (Binary, Variations)
@@ -998,9 +988,9 @@ instance Query.IsQuery ChainSyncQuery where
     TagGetUTxOs -> do
       word <- getWord8
       GetUTxOs <$> case word of
-        0x01 -> do
+        0x01 ->
           GetUTxOsAtAddresses <$> get
-        0x02 -> do
+        0x02 ->
           GetUTxOsForTxOutRefs <$> get
         _    -> fail "Invalid GetUTxOsQuery tag"
   putDelimiter = \case