fix conflicts

Author: tongtongcao

common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/KFitterWithURWell.java

@@ -6,7 +6,6 @@
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
-import org.jlab.clas.clas.math.FastMath;
 import org.jlab.clas.swimtools.Swim;
 import org.jlab.clas.tracking.kalmanfilter.AKFitter;
 import org.jlab.clas.tracking.kalmanfilter.AMeasVecs;

common-tools/coat-libs/.flattened-pom.xml

@@ -4,5 +4,5 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jlab.coat</groupId>
   <artifactId>coat-libs</artifactId>
-  <version>13.0.1-SNAPSHOT</version>
+  <version>13.5.0-SNAPSHOT</version>
 </project>

reconstruction/dc/pom.xml

@@ -36,6 +36,11 @@
       <version>13.5.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jlab.clas12.detector</groupId>
+      <artifactId>clas12detector-urwell</artifactId>
+      <version>13.5.0-SNAPSHOT</version>
+    </dependency>    
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-tracking</artifactId>