diff --git a/Discovery/Web-Content/Web-Servers/README.md b/Discovery/Web-Content/Web-Servers/README.md
index 3d474d27..9ef8b717 100644
--- a/Discovery/Web-Content/Web-Servers/README.md
+++ b/Discovery/Web-Content/Web-Servers/README.md
@@ -48,7 +48,6 @@ Reference: https://github.com/irsdl/IIS-ShortName-Scanner
 
 Discussion: https://github.com/danielmiessler/SecLists/pull/783
 
-<<<<<<< HEAD
 Date of last update: Jun 27, 2022
 
 
@@ -65,7 +64,4 @@ Date of last wordlist update: Feb 27, 2014
 Use for: Fuzzing for common filepaths in webpages created with **[Apache Axis](https://axis.apache.org/axis/)**
 
 Date of the first release of Apache Axis: [2002-10-07](https://jbossas.jboss.org/downloads/)    
-Date of the last release of Apache Axis: 2006-04-22
-=======
-Date of last update: Jun 27, 2022
->>>>>>> 0a6cbb9c (feat(docs): Moved Web-Server wordlists into their own directory)
+Date of the last release of Apache Axis: 2006-04-22
\ No newline at end of file