From 6f6fe07400fda12403db2f713a694d85a14c9220 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.brandenburg@tum.de>
Date: Tue, 5 Nov 2024 14:35:00 +0100
Subject: [PATCH] Resolve conflict in icemix.py

---
 src/graphnet/models/gnn/icemix.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphnet/models/gnn/icemix.py b/src/graphnet/models/gnn/icemix.py
index b9cecffbb..11e498821 100644
--- a/src/graphnet/models/gnn/icemix.py
+++ b/src/graphnet/models/gnn/icemix.py
@@ -9,7 +9,7 @@
 """
 import torch
 import torch.nn as nn
-from typing import Set, Dict, Any
+from typing import Set, Dict, Any, Optional
 
 from graphnet.models.components.layers import (
     Block_rel,
@@ -42,7 +42,7 @@ def __init__(
         n_rel: int = 1,
         scaled_emb: bool = False,
         include_dynedge: bool = False,
-        dynedge_args: Dict[str, Any] = None,
+        dynedge_args: Optional[Dict[str, Any]] = None,
         fourier_mapping: list = [0, 1, 2, 3, 4, 5]
     ):
         """Construct `DeepIce`.