diff --git a/obsreport/obsreporttest/otelprometheuschecker_test.go b/obsreport/obsreporttest/otelprometheuschecker_test.go
index 15639ae6030..18dccd16269 100644
--- a/obsreport/obsreporttest/otelprometheuschecker_test.go
+++ b/obsreport/obsreporttest/otelprometheuschecker_test.go
@@ -47,14 +47,9 @@ func TestPromChecker(t *testing.T) {
 	pc, err := newStubPromChecker()
 	require.NoError(t, err)
 
-<<<<<<< HEAD
-	receiver := component.NewID("fakeReceiver")
-	exporter := component.NewID("fakeExporter")
-=======
 	scraper := config.NewComponentID("fakeScraper")
 	receiver := config.NewComponentID("fakeReceiver")
 	exporter := config.NewComponentID("fakeExporter")
->>>>>>> bdc7135b (fix typo add testing for checkScraperMetrics)
 	transport := "fakeTransport"
 
 	assert.NoError(t,