Fix rebase mistakes

Author: bigmontz

packages/neo4j-driver-lite/test/unit/index.test.ts

@@ -402,6 +402,8 @@ describe('index', () => {
     )
 
     expect(graph.isPathSegment(pathSeg)).toBe(true)
+  })
+
   it('should export routing', () => {
     expect(neo4j.routing).toBeDefined()
     expect(neo4j.routing.WRITERS).toBeDefined()

packages/neo4j-driver/types/index.d.ts

@@ -204,7 +204,6 @@ declare const forExport: {
   SessionMode: SessionMode
   Neo4jError: typeof Neo4jError
   isRetriableError: typeof isRetriableError
-<<<<<<< HEAD
   Node: typeof Node
   Relationship: typeof Relationship
   UnboundRelationship: typeof UnboundRelationship
@@ -213,17 +212,7 @@ declare const forExport: {
   Integer: typeof Integer
   Record: typeof Record
   Result: typeof Result
-=======
-  Node: Node
-  Relationship: Relationship
-  UnboundRelationship: UnboundRelationship
-  PathSegment: PathSegment
-  Path: Path
-  Integer: Integer
-  Record: Record
-  Result: Result
-  EagerResult: EagerResult
->>>>>>> Introduce `Driver.executeQuery`
+  EagerResult: typeof EagerResult
   QueryResult: QueryResult
   ResultObserver: ResultObserver
   ResultSummary: typeof ResultSummary