Update

README.md

@@ -1,18 +1,13 @@
 # MACRO11
-<<<<<<< HEAD
 MACRO11 is an PDP-11 cross assembler, written in C.
-Projects files are included for MS Visual Studio, as it's been uses as part of  PDP11GUI.
+Projects files are included only for Win32 platform MS Visual Studio 2015, as it's been used as part of  PDP11GUI.
 
-This MACRO11 was forked from Richard Krebiehls version in 2008.
-[It's here](http://www.dbit.com/pub/pdp11/macro11/).
+This MACRO11 was forked from Richard Krebiehls version in 2008. Thanks!
+[Richard's version is here.](http://www.dbit.com/pub/pdp11/macro11/).
 
 Changes since then:
 * restructured the sources
 * bugfixes
 * added option "-listhex" to generate listings in hex instead of octal (helpful for work with modern logic analyzers).
 
-Also see the [MACRO11 page](http://www.retrocmp.com/tools/macro11).
-
-=======
-PDP-11 crossassembler
->>>>>>> 5e67f9fd23ac6874fcfe9732db5c80a34c252a29
+Also see my [MACRO11 page](http://www.retrocmp.com/tools/macro11).