Fix unresolved merge conflict

Author: antoniosarosi

integ-tests/python/tests/test_functions.py

@@ -40,14 +40,11 @@
     BlockConstraintForParam,
     NestedBlockConstraintForParam,
     MapKey,
-<<<<<<< HEAD
     LinkedListAliasNode,
     ClassToRecAlias,
     NodeWithAliasIndirection,
     MergeAttrs,
-=======
     OptionalListAndMap,
->>>>>>> canary
 )
 import baml_client.types as types
 from ..baml_client.tracing import trace, set_tags, flush, on_log_event