fix merge conflict

Event/TrackEvent/include/Event/Track_v3.h

@@ -323,10 +323,6 @@ namespace LHCb::Event::v3 {
         for ( auto i = 0; i < nHits().cast(); i++ ) { ids.emplace_back( lhcbID( i ).LHCbID() ); }
         return ids;
       }
-<<<<<<< HEAD
-
-=======
->>>>>>> d444a1318... format
     };
 
     template <SIMDWrapper::InstructionSet simd, LHCb::Pr::ProxyBehaviour behaviour, typename ContainerType>