diff --git a/steampipe-plugin-github/github/table_github_repository.go b/steampipe-plugin-github/github/table_github_repository.go
index f010f3cf..4d1e886a 100644
--- a/steampipe-plugin-github/github/table_github_repository.go
+++ b/steampipe-plugin-github/github/table_github_repository.go
@@ -25,7 +25,6 @@ func sharedRepositoryColumns() []*plugin.Column {
 			Name:        "id",
 			Type:        proto.ColumnType_INT,
 			Description: "The numeric ID of the repository.",
-<<<<<<< HEAD
 			Transform:   transform.FromField("Description.GitHubRepoID"),
 		},
 		{
@@ -37,13 +36,6 @@ func sharedRepositoryColumns() []*plugin.Column {
 		{
 			Name:        "name",
 			Type:        proto.ColumnType_STRING,
-=======
-			Transform:   transform.FromField("Description.ID")},
-		{Name: "node_id", Type: proto.ColumnType_STRING,
-			Description: "The node ID of the repository.",
-			Transform:   transform.FromField("Description.NodeID")},
-		{Name: "name", Type: proto.ColumnType_STRING,
->>>>>>> ffc94e0 (fix: add repo name filter in params)
 			Description: "The name of the repository.",
 			Transform:   transform.FromField("Description.Name"),
 		},