diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
index 67569aa2e..183a85daf 100644
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -494,10 +494,8 @@ body { counter-reset : page-numbers 0; }
 
 	.resetCounting { counter-set : page-numbers 1; }
 
-<<<<<<< HEAD
-	&:not(:has(.skipCounting)) {
-		counter-increment : page-numbers;
-	}
+	&:not(:has(.skipCounting)) { counter-increment : page-numbers; }
+
 }
 
 //*******************************
@@ -512,62 +510,58 @@ body { counter-reset : page-numbers 0; }
 .page{
 	.ol-ccby ol {
 		list-style-type: lower-alpha;
-	  }
-	  
-	  .ol-ccby ol ol{
+	}
+
+	.ol-ccby ol ol{
 		padding-left: 0px !important;
 		list-style-type: greek;
-	  }
-	  
-	  .ol-ccby ol ol ol {
+	}
+
+	.ol-ccby ol ol ol {
 		padding-left: 0px !important;
 		list-style-type: upper-alpha;
-	  }
-	  
-	  .ol-ccby ol ol ol ol {
+	}
+
+	.ol-ccby ol ol ol ol {
 		padding-left: 0px !important;
 		list-style-type: lower-roman;
-	  }
-	  
-	  .ol-ccby p {
+	}
+
+	.ol-ccby p {
 		padding-left: 25px;
 		text-indent: 0em !important;
-	  }
+	}
 
-	  // Non-indented, numerical lists with slight gap between paragraphs.
-	  .ol-lowerLetters ol {
+	// Non-indented, numerical lists with slight gap between paragraphs.
+	.ol-lowerLetters ol {
 		list-style-type: lower-alpha-trailing-paren;
-	  }
+	}
 
-	  .ol-lowerLetters ol li p {
+	.ol-lowerLetters ol li p {
 		display: inline;
-	  }
+	}
 
-  	  .ol-lowerLetters ol {
+  	.ol-lowerLetters ol {
 		list-style-position: inside;
 		padding: 0px;
-	  }
-    
-	  .ol-lowerLetters ol li:not(:last-child) { 
-		 margin-bottom: 0.5em; 	
-	  }      	  
+	}
 
-	  .ol-noIndent ol {
+	.ol-lowerLetters ol li:not(:last-child) { 
+		 margin-bottom: 0.5em; 	
+	}      	  
+
+	.ol-noIndent ol {
 		list-style-position: inside;
 		padding: 0px;
-	  }
-	  
-	  .ol-noIndent ol li p {
-		display: inline;
-	  }
-	  
-	  .ol-noIndent ol li:not(:last-child) { 
-		 margin-bottom: 0.5em; 	
-	  }  
-=======
-	&:not(:has(.skipCounting)) { counter-increment : page-numbers; }
->>>>>>> master
+	}
 
+	.ol-noIndent ol li p {
+		display: inline;
+	}
+
+	.ol-noIndent ol li:not(:last-child) { 
+		 margin-bottom: 0.5em; 	
+	}  
 }
 
 // *****************************