diff --git a/src/api/dotnet/Params.cs b/src/api/dotnet/Params.cs
index 3bd22e5b0..5b143d525 100644
--- a/src/api/dotnet/Params.cs
+++ b/src/api/dotnet/Params.cs
@@ -91,11 +91,7 @@ namespace Microsoft.Z3
         public Params Add(string name, bool value)
         {
             Native.Z3_params_set_bool(Context.nCtx, NativeObject, Context.MkSymbol(name).NativeObject, (value) ? 1 : 0);
-<<<<<<< HEAD
 	    return this;
-=======
-            return this;
->>>>>>> fc719a5ee82361ffedb9ef46793e3401fdc32cc5
         }
 
         /// <summary>
@@ -104,11 +100,7 @@ namespace Microsoft.Z3
         public Params Add(string name, uint value)
         {
             Native.Z3_params_set_uint(Context.nCtx, NativeObject, Context.MkSymbol(name).NativeObject, value);
-<<<<<<< HEAD
 	    return this;
-=======
-            return this;
->>>>>>> fc719a5ee82361ffedb9ef46793e3401fdc32cc5
         }
 
         /// <summary>
diff --git a/src/api/dotnet/Solver.cs b/src/api/dotnet/Solver.cs
index 77480f693..a288990a2 100644
--- a/src/api/dotnet/Solver.cs
+++ b/src/api/dotnet/Solver.cs
@@ -99,48 +99,6 @@ namespace Microsoft.Z3
 	public void Set(Symbol name, Symbol value) { Parameters = Context.MkParams().Add(name, value); }
 
 
-        /// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(string name, bool value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(string name, uint value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(string name, double value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(string name, string value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(string name, Symbol value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(Symbol name, bool value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(Symbol name, uint value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(Symbol name, double value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(Symbol name, string value) { Parameters = Context.MkParams().Add(name, value); }
-	/// <summary>
-	/// Sets parameter on the solver
-	/// </summary>
-	public void Set(Symbol name, Symbol value) { Parameters = Context.MkParams().Add(name, value); }
-
-
 
         /// <summary>
         /// Retrieves parameter descriptions for solver.
@@ -359,10 +317,6 @@ namespace Microsoft.Z3
             return lboolToStatus(r);
         }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> fc719a5ee82361ffedb9ef46793e3401fdc32cc5
         /// <summary>
         /// Retrieve fixed assignments to the set of variables in the form of consequences.
         /// Each consequence is an implication of the form