fix rebase

Author: Lms24

packages/core/test/lib/utils/applyScopeDataToEvent.test.ts

@@ -187,7 +187,6 @@ describe('applyScopeDataToEvent', () => {
     expect(event.transaction).toBe('/users/:id');
   });
 
-<<<<<<< HEAD
   it('applies the root span name to transaction events', () => {
     const data: ScopeData = {
       eventProcessors: [],
@@ -220,9 +219,6 @@ describe('applyScopeDataToEvent', () => {
   });
 
   it("doesn't apply the root span name to non-transaction events", () => {
-=======
-  it("doesn't the root span name to non-transaction events", () => {
->>>>>>> 45b7d13a2 (feat(core): Decouple `scope.transactionName` from root spans)
     const data: ScopeData = {
       eventProcessors: [],
       breadcrumbs: [],