conflict resolution isnt my strongest suit, both in code and irl

Author: preston4896

src/bases/EnclaveIdentityDao.sol

@@ -135,7 +135,7 @@ abstract contract EnclaveIdentityDao is DaoBase, SigVerifyBase {
         uint256 version,
         bytes32 key,
         EnclaveIdentityJsonObj calldata enclaveIdentityObj
-    ) private view returns (bytes memory reqData) {
+    ) private returns (bytes memory reqData) {
         IdentityObj memory identity = EnclaveIdentityLib.parseIdentityString(enclaveIdentityObj.identityStr);
         if (id != uint256(identity.id)) {
             revert Enclave_Id_Mismatch();

src/bases/FmspcTcbDao.sol

@@ -132,11 +132,7 @@ abstract contract FmspcTcbDao is DaoBase, SigVerifyBase {
         );
 
         attestationId = _attestTcb(req, hash, key);
-        _storeTcbInfoIssueEvaluation(
-            key, 
-            tcbInfo.issueDate, 
-            tcbInfo.evaluationDataNumber
-        );
+        _storeTcbInfoIssueEvaluation(key, tcbInfo.issueDate, tcbInfo.nextUpdate, tcbInfo.evaluationDataNumber);
         emit UpsertedFmpscTcb(
             uint8(tcbInfo.id),
             tcbInfo.fmspc,
@@ -212,13 +208,6 @@ abstract contract FmspcTcbDao is DaoBase, SigVerifyBase {
             }
             reqData = abi.encode(tcbInfo, module, encodedModuleIdentities, encodedTcbLevels, tcbInfoObj.tcbInfoStr, tcbInfoObj.signature);
         }
-
-        _storeTcbInfoIssueEvaluation(
-            key, 
-            tcbInfo.issueDate, 
-            tcbInfo.nextUpdate, 
-            tcbInfo.evaluationDataNumber
-        );
     }
 
     function _validateTcbInfo(TcbInfoJsonObj calldata tcbInfoObj) private view {