diff --git a/T2dMath.Pipeline/Time2DepthLogging.cs b/T2dMath.Pipeline/Time2DepthLogging.cs
index 5bb0b2e..c1a5216 100644
--- a/T2dMath.Pipeline/Time2DepthLogging.cs
+++ b/T2dMath.Pipeline/Time2DepthLogging.cs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 using System.Collections.Generic;
 using System.Linq;
 using T2dMath.ILogAlgorithm;
@@ -75,60 +74,3 @@ public static void Time2DepthLogging(
         }
     }
 }
-=======
-using System.Collections.Generic;
-using System.Linq;
-using T2dMath.ILogAlgorithm;
-
-namespace T2dMath.Pipeline {
-    using AlgCurveInfo = (
-        string name_curve,
-        ILogTransformation alg,
-        string[] name_curves,
-        string[] name_params
-    );
-    using CurveInfoTransformation = (
-        string name_curve,
-        double offset,
-        double time_delay,
-        bool use_only_rotor,
-        IGridTransformation alg_avg,
-        string[] name_params_avg
-    );
-
-    public partial class Pipelines {
-        //depth_monoton, value_monoton, depthGrid, param_alg
-        public delegate double[] AlgorithmAvarage(
-            double[] depth_monotone,
-            double[] value_monoton,
-            double[] depthGrid,
-            object[] param
-        );
-
-        //
-
-        public static void Time2DepthLogging(
-            double[] time_tool,
-            IDictionary<string, double[]> input_curves,
-            Dictionary<string, object> input_parameters,
-            AlgCurveInfo[] calculate_time_curve,
-            CurveInfoTransformation[] curve_out_param,
-            double[] time_surface,
-            double[] depth,
-            double[] f_stop,
-            double[] f_rotor,
-            AlgCurveInfo[] calculate_depth_curve,
-            double step_grid,
-            out double[] depth_out,
-            out Dictionary<string, double[]> curve_out,
-            ProgressCallback progress = null,
-            InfoCallback info = null
-        ) {
-            IEnumerable<double> t = new double[5];
-            var r = t.ElementAt(0);
-            depth_out = null;
-            curve_out = null;
-        }
-    }
-}
->>>>>>> 62659233a362a58abee892789f6088ba177713d3