diff --git a/README.md b/README.md
index 66d5e24da..c91a76af0 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ scoop install unmojang/fjordlauncher
 
 You can get installers or portable builds from the [releases section](https://github.com/unmojang/FjordLauncher/releases/latest), MSVC builds are recommended over MinGW builds, but there's no real difference.
 
-<<<<<<< HEAD
 ### macOS
 
 #### [Homebrew](https://brew.sh) (recommended)