Fixed merge conflict text

sysinternals/index.md

@@ -26,15 +26,10 @@ You can view the entire Sysinternals Live tools directory in a browser at [https
 ### What's New (September 11, 2017) ###
   - [Sysmon v6.10](~/downloads/sysmon.md)  
     This update to Sysmon, a background monitor that records activity to the event log for use in security incident detection and forensics, adds monitoring of WMI filters and consumers, an autostart mechanism commonly used by malware, and fixes a bug in image load filtering. 
-<<<<<<< HEAD
-  - [Process Monitor v3.4](~/downloads/procmon.md)  
-    Process Monitor, a file system registry, process and network real-time monitor, now includes a /runtime switch for terminating monitoring after a specified amount of time, when in hexadecimal mode shows process tree process IDs in hexadecimal, and fixes a bug in automated boot log conversion. 
-  - [Autoruns v13.8](~/downloads/autoruns.md)  
-=======
+
   - [Process Monitor v3.40](~/downloads/procmon.md)
     Process Monitor, a file system registry, process and network real-time monitor, now includes a /runtime switch for terminating monitoring after a specified amount of time, when in hexadecimal mode shows process tree process IDs in hexadecimal, and fixes a bug in automated boot log conversion. 
   - [Autoruns v13.80](~/downloads/autoruns.md) 
->>>>>>> 5121f1fe2c080dc60f820d8f61d4800acfaa3ffb
     This release of Autoruns, a utility for viewing and managing autostart execution points (ASEPs), adds additional autostart entry points, has asynchronous file saving, fixes a bug parsing 32-bit paths on 64-bit Windows, shows the display name for drivers and services, and fixes a bug in offline Virus Total scanning. 
 
 ### What's New (May 16, 2017) ###