[cxx-interop][nfc] post-rebase fallout for a few tests.

Author: zoecarver

test/Interop/Cxx/stdlib/overlay/Inputs/custom-sequence.h

@@ -108,7 +108,6 @@ struct HasTemplatedIterator {
 
 typedef HasTemplatedIterator<int> HasUninstantiatableIterator;
 
-<<<<<<< HEAD
 struct HasInheritedConstIterator {
 private:
   InheritedConstIterator b = InheritedConstIterator(1);