diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl
index 14ef378f..aabed3a0 100644
--- a/Admin/Templates/config.tpl
+++ b/Admin/Templates/config.tpl
@@ -155,18 +155,14 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
 	</tr>
 	<tr>
 		<td>Error Reporting</td>
-<<<<<<< HEAD
 		<td><b>
 		<?php 
 		echo (ERROR_REPORT=="error_reporting (0);")? "No": (ERROR_REPORT=="error_reporting (E_ALL);")? "Yes (E_ALL)":"Yes (E_ALL ^ E_NOTICE)";
 		?>
 		</b></td>
 	</tr>	
-=======
 		<td><b><?php echo (ERROR_REPORT=="error_reporting (0);")? "No": "Yes";?></b></td>
 	</tr>
-	
->>>>>>> 743a19326cddff179e325da92167a5362a94a6a2
 	</table>
 
 	<table id="member">
diff --git a/Admin/Templates/editServerSet.tpl b/Admin/Templates/editServerSet.tpl
index 2f57444f..c721034d 100644
--- a/Admin/Templates/editServerSet.tpl
+++ b/Admin/Templates/editServerSet.tpl
@@ -289,14 +289,10 @@ function refresh(tz) {
 					<tr>
 						<td>Error Reporting</td>
 						<td><select name="error">
-<<<<<<< HEAD
 							<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORTING=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
 							<option value="error_reporting (0);" <?php if(ERROR_REPORTING=="error_reporting (0);") echo "selected";?>>No</option>
-=======
 							<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORT=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
 							<option value="error_reporting (0);" <?php if(ERROR_REPORT=="error_reporting (0);") echo "selected";?>>No</option>
-
->>>>>>> 743a19326cddff179e325da92167a5362a94a6a2
 						</select>
 						</td>
 					</tr>