diff --git a/envi/bil.h b/envi/bil.h
index 79a655d..21dfdfa 100644
--- a/envi/bil.h
+++ b/envi/bil.h
@@ -825,7 +825,7 @@ public:
 		return true;
 	}
 
-<<<<<<< HEAD
+
 	//crop specified area the of the original file
 	bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
 
@@ -852,8 +852,7 @@ public:
 		return true;
 	}
 
-=======
->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
+
 	//close the file
 	bool close(){
 		file.close();
diff --git a/envi/bip.h b/envi/bip.h
index 8d62b73..2f75e5f 100644
--- a/envi/bip.h
+++ b/envi/bip.h
@@ -908,7 +908,7 @@ public:
 		return true;
 	}
 
-<<<<<<< HEAD
+
 	//crop specified area the of the original file
 	bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
 
@@ -933,8 +933,7 @@ public:
 		return true;
 	}
 
-=======
->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
+
 	//close the file
 	bool close(){
 		file.close();
diff --git a/envi/bsq.h b/envi/bsq.h
index 57a0daa..8c475cb 100644
--- a/envi/bsq.h
+++ b/envi/bsq.h
@@ -744,7 +744,7 @@ public:
 		free(bandj);
 		return true;
 	}
-<<<<<<< HEAD
+
 
 	//crop specified area the of the original file
 	bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
@@ -773,8 +773,7 @@ public:
 		free(temp);
 		return true;
 	}
-=======
->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
+
 
 	//close the file
 	bool close(){
diff --git a/envi/envi.h b/envi/envi.h
index b219f41..d7a1f37 100644
--- a/envi/envi.h
+++ b/envi/envi.h
@@ -711,7 +711,7 @@ public:
 		}
 		return false;
 	}
-<<<<<<< HEAD
+
 
 	//crop specified area the of the original file
 	bool crop(std::string outfile,unsigned x0, unsigned y0, unsigned x1, unsigned y1){
@@ -748,8 +748,7 @@ public:
 		}
 		return false;
 	}
-=======
->>>>>>> ef70330ef266529a0aef1935f95c20feae8958d1
+
 };
 
 }	//end namespace rts
--
libgit2 0.21.4