From 69bc7e73e77e188b73c3b30dfd2ad62227d3de75 Mon Sep 17 00:00:00 2001
From: Keerthan Reddy Mala <kremala@amazon.com>
Date: Fri, 7 Jul 2023 11:09:31 -0700
Subject: [PATCH] address review comment

---
 merge/conflict_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/merge/conflict_test.go b/merge/conflict_test.go
index 8d816948..49841856 100644
--- a/merge/conflict_test.go
+++ b/merge/conflict_test.go
@@ -94,7 +94,6 @@ func TestToSet(t *testing.T) {
 }
 
 func TestConflictsFromManagers(t *testing.T) {
-
 	got := merge.ConflictsFromManagers(fieldpath.ManagedFields{
 		"Bob": fieldpath.NewVersionedSet(
 			_NS(