Index: /issm/trunk-jpl-damage/src/c/objects/Elements/Penta.cpp
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/Elements/Penta.cpp	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/Elements/Penta.cpp	(revision 11419)
@@ -769,6 +769,4 @@
 }
 /*}}}*/
-<<<<<<< .working
-=======
 /*FUNCTION Penta::CreateJacobianMatrix{{{1*/
 void  Penta::CreateJacobianMatrix(Mat Jff){
@@ -804,5 +802,4 @@
 }
 /*}}}*/
->>>>>>> .merge-right.r11410
 /*FUNCTION Penta::DeepEcho{{{1*/
 void Penta::DeepEcho(void){
@@ -4339,7 +4336,5 @@
 	if(converged){
 		/*Convert enthalpy into temperature and water fraction*/
-<<<<<<< .working
 		for(i=0;i<numdof;i++) matpar->EnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]);
-=======
 		for(i=0;i<numdof;i++){
 			matpar->EnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]);
@@ -4347,5 +4342,4 @@
 			//if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector");
 		}
->>>>>>> .merge-right.r11410
 			
 		this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,values));
Index: /issm/trunk-jpl-damage/src/c/objects/Elements/Penta.h
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/Elements/Penta.h	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/Elements/Penta.h	(revision 11419)
@@ -231,10 +231,7 @@
 		ElementMatrix* CreateKMatrixDiagnosticVertVolume(void);
 		ElementMatrix* CreateKMatrixDiagnosticVertSurface(void);
-<<<<<<< .working
-=======
 		ElementMatrix* CreateJacobianDiagnosticHoriz(void);
 		ElementMatrix* CreateJacobianDiagnosticMacayeal2d(void);
 		ElementMatrix* CreateJacobianDiagnosticPattyn(void);
->>>>>>> .merge-right.r11410
 		ElementMatrix* CreateJacobianDiagnosticStokes(void);
 		void           InputUpdateFromSolutionDiagnosticHoriz( double* solutiong);
Index: /issm/trunk-jpl-damage/src/c/objects/Elements/Tria.h
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/Elements/Tria.h	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/Elements/Tria.h	(revision 11419)
@@ -84,8 +84,5 @@
 		void   CreateKMatrix(Mat Kff, Mat Kfs,Vec df);
 		void   CreatePVector(Vec pf);
-<<<<<<< .working
-=======
 		void   CreateJacobianMatrix(Mat Jff);
->>>>>>> .merge-right.r11410
 		int    GetNodeIndex(Node* node);
 		int    Sid();
Index: /issm/trunk-jpl-damage/src/c/objects/KML/KML_File.cpp
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/KML/KML_File.cpp	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/KML/KML_File.cpp	(revision 11419)
@@ -66,5 +66,4 @@
 	KML_Object::DeepEcho(indent);
 
-<<<<<<< .working
 /*  loop over the kml objects for the file  */
 
@@ -82,6 +81,4 @@
 		_printf_(flag,"%s        kmlobj: [empty]\n"    ,indent);
 
-=======
->>>>>>> .merge-right.r11410
 	return;
 }
Index: /issm/trunk-jpl-damage/src/c/objects/KML/KML_Object.cpp
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/KML/KML_Object.cpp	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/KML/KML_Object.cpp	(revision 11419)
@@ -26,8 +26,5 @@
 	attrib    =new DataSet;
 	commnt    =new DataSet;
-<<<<<<< .working
-=======
 	kmlobj    =new DataSet;
->>>>>>> .merge-right.r11410
 
 }
@@ -44,11 +41,8 @@
 		commnt    =NULL;
 	}
-<<<<<<< .working
-=======
 	if (kmlobj) {
 		delete kmlobj;
 		kmlobj    =NULL;
 	}
->>>>>>> .merge-right.r11410
 
 }
@@ -63,8 +57,5 @@
 	_printf_(flag,"        attrib: (size=%d)\n" ,attrib->Size());
 	_printf_(flag,"        commnt: (size=%d)\n" ,commnt->Size());
-<<<<<<< .working
-=======
 	_printf_(flag,"        kmlobj: (size=%d)\n" ,kmlobj->Size());
->>>>>>> .merge-right.r11410
 
 	return;
@@ -106,6 +97,4 @@
 		_printf_(flag,"%s        commnt: [empty]\n"    ,indent);
 
-<<<<<<< .working
-=======
 /*  loop over the unknown objects for the object  */
 
@@ -122,5 +111,4 @@
 		_printf_(flag,"%s        kmlobj: [empty]\n"    ,indent);
 
->>>>>>> .merge-right.r11410
 	return;
 }
@@ -134,6 +122,4 @@
 	;
 
-<<<<<<< .working
-=======
 	memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char));
 	strcat(indent2,"  ");
@@ -144,5 +130,4 @@
 		}
 
->>>>>>> .merge-right.r11410
 	return;
 }
@@ -273,5 +258,4 @@
 		kobj->Read(fid,kstr);
 		kmlobj    ->AddObject((Object*)kobj);
->>>>>>> .merge-right.r11410
 	}
 
Index: /issm/trunk-jpl-damage/src/c/objects/KML/KML_Object.h
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/KML/KML_Object.h	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/KML/KML_Object.h	(revision 11419)
@@ -21,8 +21,5 @@
 		DataSet* attrib;
 		DataSet* commnt;
-<<<<<<< .working
-=======
 		DataSet* kmlobj;
->>>>>>> .merge-right.r11410
 
 		/*KML_Object constructors, destructors {{{1*/
Index: /issm/trunk-jpl-damage/src/c/objects/KML/KML_Unknown.cpp
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/KML/KML_Unknown.cpp	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/KML/KML_Unknown.cpp	(revision 11419)
@@ -98,11 +98,8 @@
 void  KML_Unknown::Write(FILE* filout,const char* indent){
 
-<<<<<<< .working
-=======
 	char*        valuei;
 	char*        vtoken;
 	char         nl[]={'\n','\0'};
 
->>>>>>> .merge-right.r11410
 	fprintf(filout,"%s<%s",indent,name);
 	WriteAttrib(filout," ");
@@ -110,10 +107,8 @@
 	WriteCommnt(filout,indent);
 
-<<<<<<< .working
 	KML_Object::Write(filout,indent);
 
 	if (value     )
 		fprintf(filout,"%s  %s\n",indent,value);
-=======
 	if (value     ) {
 		valuei=(char *) xmalloc((strlen(value)+1)*sizeof(char));
@@ -125,8 +120,5 @@
 		while (vtoken=strtok(NULL,nl))
 			fprintf(filout,"%s  %s\n",indent,vtoken);
->>>>>>> .merge-right.r11410
 
-<<<<<<< .working
-=======
 		xfree((void**)&valuei);
 	}
@@ -134,5 +126,4 @@
 	KML_Object::Write(filout,indent);
 
->>>>>>> .merge-right.r11410
 	fprintf(filout,"%s</%s>\n",indent,name);
 
@@ -166,10 +157,8 @@
 			_error_("KML_Unknown::Read -- Unexpected closing tag %s.\n",kstri);
 
-<<<<<<< .working
 		else if (strncmp(kstri,"<",1))
 			KMLFileTokenParse( value     ,NULL,0,
 							  NULL,
 							  fid);
-=======
 		else if (strncmp(kstri,"<",1)) {
 			if (value) {
@@ -183,5 +172,4 @@
 			}
 		}
->>>>>>> .merge-right.r11410
 
 		else if (!strncmp(kstri,"<",1))
Index: /issm/trunk-jpl-damage/src/c/objects/Loads/Icefront.h
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/Loads/Icefront.h	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/Loads/Icefront.h	(revision 11419)
@@ -76,8 +76,5 @@
 		void  CreateKMatrix(Mat Kff, Mat Kfs);
 		void  CreatePVector(Vec pf);
-<<<<<<< .working
-=======
 		void  CreateJacobianMatrix(Mat Jff);
->>>>>>> .merge-right.r11410
 		void  PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax);
 		void  PenaltyCreatePVector(Vec pf, double kmax);
Index: /issm/trunk-jpl-damage/src/c/objects/Loads/Penpair.cpp
===================================================================
--- /issm/trunk-jpl-damage/src/c/objects/Loads/Penpair.cpp	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/objects/Loads/Penpair.cpp	(revision 11419)
@@ -214,6 +214,4 @@
 }
 /*}}}1*/
-<<<<<<< .working
-=======
 /*FUNCTION Penpair::CreateJacobianMatrix{{{1*/
 void  Penpair::CreateJacobianMatrix(Mat Jff){
@@ -221,5 +219,4 @@
 }
 /*}}}1*/
->>>>>>> .merge-right.r11410
 /*FUNCTION Penpair::PenaltyCreateKMatrix {{{1*/
 void  Penpair::PenaltyCreateKMatrix(Mat Kff, Mat Kfs,double kmax){
Index: /issm/trunk-jpl-damage/src/c/solutions/controltao_core.cpp
===================================================================
--- /issm/trunk-jpl-damage/src/c/solutions/controltao_core.cpp	(revision 11418)
+++ /issm/trunk-jpl-damage/src/c/solutions/controltao_core.cpp	(revision 11419)
@@ -25,5 +25,4 @@
 
 	/*TAO*/
-<<<<<<< .working
 	int       ierr,numberofvertices;
 	AppCtx    user;
@@ -32,5 +31,4 @@
 	Vec       XL = NULL;
 	Vec       XU = NULL;
-=======
 	int        ierr;
 	int        num_controls,solution_type;
@@ -43,5 +41,4 @@
 	Vec        XL             = NULL;
 	Vec        XU             = NULL;
->>>>>>> .merge-right.r11410
 
 	/*Initialize TAO*/
@@ -51,6 +48,4 @@
 	if(ierr) _error_("Could not initialize Tao");
 
-<<<<<<< .working
-=======
 	/*Recover some parameters*/
 	femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
@@ -61,5 +56,4 @@
 	maxiter=nsteps*(int)dummy[0]; xfree((void**)&dummy);
 
->>>>>>> .merge-right.r11410
 	/*Initialize TAO*/
 	TaoCreate(PETSC_COMM_WORLD,&tao);
@@ -121,6 +115,4 @@
 	VecFree(&gradient);
 	CostFunctionx(fcn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-<<<<<<< .working
-=======
 
 	/*Compute gradient*/
@@ -132,5 +124,4 @@
 	xfree((void**)&cost_functions);
 	xfree((void**)&cost_functionsd);
->>>>>>> .merge-right.r11410
 	return 0;
 }