Updated README

README.md

@@ -4,20 +4,11 @@
 ## GUI for [Repertory](https://bitbucket.org/blockstorage/repertory)
 Repertory allows you to mount Sia, Skynet and/or ScPrime blockchain storage solutions via FUSE on Linux/OS X or via WinFSP on Windows.
 
-# Windows Issue
-If you're experiencing slow copy, read, and/or write, please install the following UI version. This is a special build that includes WinFSP 2020.2:
-
-* [Repertory UI v1.1.5 Windows 64-bit](https://bitbucket.org/blockstorage/repertory-testing/downloads/repertory-ui_1.1.5_win.exe)
-
-# Discord Invite
-* [Repertory Discord](https://discord.gg/f2rCfqRgrJ) 
-
 ## Requirements
 * Sia >=1.4.1
 * ScPrime >=1.4.1.2
 
 ## Downloads
-<<<<<<< HEAD
 * **Repertory UI v1.3.2 Linux
   64-bit** [<Download\>](https://bitbucket.org/blockstorage/repertory-ui/downloads/repertory-ui_1.3.2_linux_x86_64.AppImage)
   * NOTE: Linux distributions require `fuse` and `libfuse` to be installed.
@@ -25,12 +16,6 @@ If you're experiencing slow copy, read, and/or write, please install the followi
   64-bit** [<Download\>](https://bitbucket.org/blockstorage/repertory-ui/downloads/repertory-ui_1.3.2_mac.dmg)
 * **Repertory UI v1.3.2 Windows
   64-bit** [<Download\>](https://bitbucket.org/blockstorage/repertory-ui/downloads/repertory-ui_1.3.2_win.exe)
-=======
-* **Repertory UI v1.1.4 Linux 64-bit** [<Download\>](https://bitbucket.org/blockstorage/repertory-ui/downloads/repertory-ui_1.1.4_linux_x86_64.AppImage)
-    * NOTE: Linux distributions require `fuse` and `libfuse` to be installed.
-* **Repertory UI v1.1.4 OS X 64-bit** [<Download\>](https://bitbucket.org/blockstorage/repertory-ui/downloads/repertory-ui_1.1.4_mac.dmg)
-* **Repertory UI v1.1.4 Windows 64-bit** [<Download\>](https://bitbucket.org/blockstorage/repertory-ui/downloads/repertory-ui_1.1.4_win.exe)
->>>>>>> origin/master
 
 ## Supported Platforms
 * OS X 64-bit