diff --git a/README.md b/README.md
index 33c7d2830..b4d098dd3 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,10 @@ including
 - the Lynx console.
 - the Ohio Scientific Challenger 1P.
 - the Commander X16.
+<<<<<<< HEAD
 - the Synertek Systems Sym-1.
+=======
+>>>>>>> 2583dfb71 (Update README.md)
 
 The libraries are fairly portable, so creating a version for other 6502s
 shouldn't be too much work.