diff --git a/extern/json/README.blender b/extern/json/README.blender
index e953008621d..79ef3767f10 100644
--- a/extern/json/README.blender
+++ b/extern/json/README.blender
@@ -1,6 +1,5 @@
 Project: JSON
 URL: https://github.com/nlohmann/json/
-<<<<<<< HEAD
 License: SPDX:MIT
 Copyright: Copyright (c) 2013-2021 Niels Lohmann
 Upstream version: 3.11.3