diff --git a/LICENSE b/LICENSE
index e9ba0de3f57bb9e30a7ced1ddd872e9a96ac6913..636ed8404e51bb10dec003af795e5621f9c8efe8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -23,7 +23,6 @@ granted any other rights beyond what is expressly stated herein.  Subject to the
 foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
 and/or sell the Software.
 
-<<<<<<< HEAD
 This EE License applies only to the part of this Software that is not
 distributed as part of GitLab Community Edition (CE), and that is not a file
 that produces client-side JavaScript, in whole or in part. Any part of this
@@ -43,9 +42,6 @@ THE SOFTWARE.
 For all third party components incorporated into the GitLab Software, those
 components are licensed under the original license provided by the owner of the
 applicable component.
-=======
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
->>>>>>> upstream/master
 
 ---