more grammar fixes

src/Language/Wasm/Validate.hs

@@ -182,6 +182,7 @@ checkMemoryInstr size memarg = do
     isMemArgValid size memarg
     Ctx { mems } <- ask 
     if length mems < 1 then throwError (MemoryIndexOutOfRange 0) else return ()
+<<<<<<< HEAD
 
 getBlockType :: BlockType -> Checker Arrow
 getBlockType (Inline Nothing) = return $ empty ==> empty
@@ -196,6 +197,8 @@ getResultType (Inline (Just valType)) = return [valType]
 getResultType (TypeIndex typeIdx) = do
     Ctx { types } <- ask
     maybeToEither TypeIndexOutOfRange $ results <$> types !? typeIdx
+=======
+>>>>>>> 40291c3 (more grammar fixes)
 
 getInstrType :: Instruction Natural -> Checker Arrow
 getInstrType Unreachable = return $ Any ==> Any