fixed merge conflicts

Author: jahir-raihan

data_structures/binary_tree/binary_tree_maximum_path_sum.py

@@ -66,7 +66,7 @@ def __init__(self, root):
         self.sum = -9999999999
         self.root = root
 
-    def traverse(self, root: TreeNode | None) -> int:
+    def traverse(self, root: TreeNode) -> int:
 
         """
         Returns maximum path sum by recursively taking max_path_sum from left