diff --git a/spiel/style.css b/spiel/style.css
index f0af9cec23..51146d5a0d 100644
--- a/spiel/style.css
+++ b/spiel/style.css
@@ -7,11 +7,7 @@ Description: Spiel is a game magazine theme.
 Requires at least: 6.0
 Tested up to: 6.4
 Requires PHP: 5.7
-<<<<<<< HEAD
 Version: 1.0.2
-=======
-Version: 1.0.1
->>>>>>> parent of 2f6edbda3 (Remove undeployed version of Spiel)
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: spiel