diff --git a/Gemfile b/Gemfile
index 00a844d..50bc883 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,11 +2,7 @@
 
 source "https://rubygems.org"
 
-<<<<<<< HEAD
-gem "jekyll-theme-chirpy", "~> 7.3"
-=======
 gem "jekyll-theme-chirpy", "~> 7.3", ">= 7.3.1"
->>>>>>> v7.3.1
 
 gem "html-proofer", "~> 5.0", group: :test