chore: resolve conflicts

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>

Co-Authored-By: Claude <noreply@anthropic.com>

Author: dbasunag

utilities/opendatahub_logger.py

@@ -116,7 +116,7 @@ def format(self, record: logging.LogRecord) -> str:
         try:
             json.loads(msg)
             return msg
-        except (json.JSONDecodeError, TypeError):
+        except json.JSONDecodeError, TypeError:
             return json.dumps({
                 "timestamp": datetime.fromtimestamp(record.created, tz=UTC).isoformat(),
                 "logger": record.name,