diff --git a/examples/NK_baseline_steadystate.m b/examples/NK_baseline_steadystate.m
index 7398303d7..c8a2f5d0e 100644
--- a/examples/NK_baseline_steadystate.m
+++ b/examples/NK_baseline_steadystate.m
@@ -96,20 +96,11 @@ g2=epsilon/(epsilon-1)*g1;
 %% end own model equations
 
 for iter = 1:length(M_.params) %update parameters set in the file
-<<<<<<< HEAD
-    eval([ 'M_.params(' num2str(iter) ') = ' M_.param_names(iter,:) ';' ])
-=======
   eval([ 'M_.params(' num2str(iter) ') = ' M_.param_names{iter} ';' ])
->>>>>>> master
 end
 
 NumberOfEndogenousVariables = M_.orig_endo_nbr; %auxiliary variables are set automatically
 for ii = 1:NumberOfEndogenousVariables
-<<<<<<< HEAD
-    varname = deblank(M_.endo_names(ii,:));
-    eval(['ys(' int2str(ii) ') = ' varname ';']);
-=======
   varname = M_.endo_names{ii};
   eval(['ys(' int2str(ii) ') = ' varname ';']);
->>>>>>> master
 end
diff --git a/matlab/lmmcp/dyn_lmmcp_func.m b/matlab/lmmcp/dyn_lmmcp_func.m
index c25eff690..0da1f7565 100644
--- a/matlab/lmmcp/dyn_lmmcp_func.m
+++ b/matlab/lmmcp/dyn_lmmcp_func.m
@@ -46,12 +46,6 @@ for it = 2:(periods+1)
             A(i_rows,i_cols_A) = jacobian(eq_index,i_cols_j);
         end
     end
-    i_rows = i_rows + ny;
-    i_cols = i_cols + ny;
-    if nargout == 2 && it > 2
-        i_cols_A = i_cols_A + ny;
-    end
-end
 
     i_rows = i_rows + ny;
     i_cols = i_cols + ny;