Fixed readme??

README.md

@@ -21,21 +21,12 @@ Works on both Online and Single-player games
   - Choose "Betas".
   - Opt into the `multi_test - Test multiplayer P2P` beta and the game will automatically reinstall.
 
-<<<<<<< HEAD
 2. Download the [latest](/downloads/latest/Assembly-CSharp.dll) DLL file.
 
 3. Locate the Assembly-CSharp.dll in your Garfield Kart Folder
   - `C:\Program Files (x86)\Steam\steamapps\common\Garfield Kart\GarfieldKartNoMulti_Data\Managed`
   - `C:\Program Files (x86)\Steam\steamapps\common\Garfield Kart\Garfield_Master7_Data\Managed`
 4. Replace the Assembly-CSharp.dll with the one downloaded in [Step 2](/downloads/latest/Assembly-CSharp.dll).
-=======
-2. Switch to the Beta Version of Garfield Kart (multi_test) in Steam Game properties.
-
-3. Locate the Assembly-CSharp.dll in your Garfield Kart Folder
-  - `C:\Program Files (x86)\Steam\steamapps\common\Garfield Kart\Garfield_Master7_Data\Managed`
-4. Replace the Assembly-CSharp.dll with the one downloaded in [Step 1](/downloads/latest/Assembly-CSharp.dll).
-
->>>>>>> e52bfb8... Fixed README.md
 5. Have fun!
 
 https://user-images.githubusercontent.com/28388670/185535383-9564f903-b036-4e56-b2cf-acc0f7dbb37b.mp4