diff --git a/LICENSE b/LICENSE
index 5b4df1b9719808b5ff2a654226023943bd5b177f..d645695673349e3947e8e5ae42332d0ac3164cd7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,8 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-<<<<<<< HEAD
    limitations under the License.
-=======
-   limitations under the License.
->>>>>>> e1a202f (Updated)