Resolving a merge conflict that came from ammending the previous commit

Author: ter-maximus

src/epidemik/EpiModel.py

@@ -198,7 +198,7 @@ def _new_cases(self, population: np.ndarray, time: float, pos: Dict) -> np.ndarr
 
         return diff
 
-    def plot(self, title: Union[str, None]= None, normed: bool = True, show: bool = True, ax: plt.Axes = None, **kwargs):
+    def plot(self, title: Union[str, None]= None, normed: bool = True, show: bool = True, ax: Union[plt.Axes, None] = None, **kwargs):
         """
         Convenience function for plotting