Get rid of merging tags

src/google/protobuf/repeated_field_unittest.cc

@@ -889,10 +889,6 @@ TEST(RepeatedPtrField, UnambiguousConstructor) {
 
   // Construction from string iterators for the unique string overload "g"
   // works.
-<<<<<<< HEAD
-=======
-  // std::string b[2] = {"abc", "xyz"};
->>>>>>> refs/tags/sync-piper
   // Disabling this for now, this is actually ambiguous with libstdc++.
   // std::string b[2] = {"abc", "xyz"};
   // EXPECT_TRUE(X::g({b, b + 2}));