diff --git a/PHILOSOPHY.md b/PHILOSOPHY.md
index 0c57309022806d429868c23c1a11113ffbba12a6..9a9f0fd177384d5c1b8165ec9a2f19e805184fb3 100644
--- a/PHILOSOPHY.md
+++ b/PHILOSOPHY.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
 This document is intended to communicate the product philosophy GitLab uses in creating GitLab Enterprise Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
-=======
-This document is intended to communicate the product philosophy GitLab uses in creating GitLab Community Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
->>>>>>> upstream/master