fix merge

NN/models/cob_rl_model.py

@@ -267,17 +267,6 @@ class COBRLModelInterface(ModelInterface):
         
         logger.info(f"COB RL Model Interface initialized on {self.device}")
         
-<<<<<<< HEAD
-    def predict(self, cob_features) -> Dict[str, Any]:
-=======
-    def to(self, device):
-        """PyTorch-style device movement method"""
-        self.device = device
-        self.model = self.model.to(device)
-        return self
-        
-    def predict(self, cob_features: np.ndarray) -> Dict[str, Any]:
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
         """Make prediction using the model"""
         self.model.eval()
         with torch.no_grad():

NN/models/dqn_agent.py

@@ -4,11 +4,6 @@ import torch.optim as optim
 import numpy as np
 from collections import deque
 import random
-<<<<<<< HEAD
-from typing import Tuple, List
-=======
-from typing import Tuple, List, Dict, Any
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
 import os
 import sys
 import logging