Resolve conflicts + add `CannonErrors()`

packages/contracts-bedrock/contracts/cannon/libraries/CannonErrors.sol

+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+/// @notice Thrown when a passed part offset is out of bounds.
+error PartOffsetOOB();

packages/contracts-bedrock/src/cannon/PreimageOracle.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 import { IPreimageOracle } from "./interfaces/IPreimageOracle.sol";
 import { PreimageKeyLib } from "./PreimageKeyLib.sol";
+import "./libraries/CannonErrors.sol";
 
 /// @title PreimageOracle
 /// @notice A contract for storing permissioned pre-images.
@@ -62,7 +63,7 @@ contract PreimageOracle is IPreimageOracle {
 
         // Revert if the given part offset is not within bounds.
         if (_partOffset > _size + 8 || _size > 32) {
-            revert("part offset must be within bounds");
+            revert PartOffsetOOB();
         }
 
         // Prepare the local data part at the given offset
@@ -97,7 +98,10 @@ contract PreimageOracle is IPreimageOracle {
 
             // revert if part offset > size+8 (i.e. parts must be within bounds)
             if gt(_partOffset, add(size, 8)) {
-                revert(0, 0)
+                // Store "PartOffsetOOB()"
+                mstore(0, 0xfe254987)
+                // Revert with "PartOffsetOOB()"
+                revert(0x1c, 4)
             }
             // we leave solidity slots 0x40 and 0x60 untouched,
             // and everything after as scratch-memory.

packages/contracts-bedrock/src/cannon/interfaces/IPreimageOracle.sol

@@ -35,7 +35,8 @@ interface IPreimageOracle {
     function loadLocalData(
         uint256 _ident,
         bytes32 _word,
-        uint8 _size
+        uint256 _size,
+        uint256 _partOffset
     ) external returns (bytes32 key_);
 
     /// @notice Prepares a preimage to be read by keccak256 key, starting at