diff --git a/.gitignore b/.gitignore
index 0751b8a..195e773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
+<<<<<<< HEAD
 node_modules
 _site
+=======
+>>>>>>> v7.3.1
 # Bundler cache
 .bundle
 vendor
diff --git a/Gemfile b/Gemfile
index b881076..00a844d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,11 @@
 
 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