fix conflicts some more

cuda/UT/compassUT/src/UTFastFitter.cu

@@ -44,8 +44,8 @@ __host__ __device__ float fastfitter(
 {
 
   const float ty = velo_state.ty;
-  const float zKink = PrVeloUTConst::magFieldParams[0] - ty * ty * PrVeloUTConst::magFieldParams[1] -
-                      ty * ty * ty * ty * PrVeloUTConst::magFieldParams[2];
+  const float zKink = UT::Constants::magFieldParams[0] - ty * ty * UT::Constants::magFieldParams[1] -
+                      ty * ty * ty * ty * UT::Constants::magFieldParams[2];
   const float xMidField = velo_state.x + velo_state.tx * (zKink - velo_state.z);
 
   const float zDiff = 0.001f * (zKink - UT::Constants::zMidUT);

integration/non_event_data/src/UTLookupTables.cpp

@@ -9,12 +9,7 @@ namespace {
   using std::to_string;
 } // namespace
 
-<<<<<<< HEAD
-Consumers::UTLookupTables::UTLookupTables(UTMagnetTool*& tool)
-  : m_tool{tool} {}
-=======
-Consumers::UTLookupTables::UTLookupTables(PrUTMagnetTool*& tool) : m_tool {tool} {}
->>>>>>> 87e0df64bd7f34c62087cb872a7cb050396329c6
+Consumers::UTLookupTables::UTLookupTables(UTMagnetTool*& tool) : m_tool {tool} {}
 
 void Consumers::UTLookupTables::consume(std::vector<char> const& data)
 {