fix merge conflict

Author: obinnaokafor

src/langtrace_python_sdk/instrumentation/neo4j/patch.py

@@ -53,11 +53,7 @@ def traced_method(wrapped, instance, args, kwargs):
             "langtrace.version": v(LANGTRACE_SDK_NAME),
             "db.system": "neo4j",
             "db.operation": api["OPERATION"],
-<<<<<<< HEAD
-            "db.query": json.dumps(args[0]) if args and len(args) > 0 else "",
-=======
             "db.query": query_text,
->>>>>>> development
             **(extra_attributes if extra_attributes is not None else {}),
         }