diff --git a/gemfiles/activerecord_7.2.gemfile b/gemfiles/activerecord_7.2.gemfile
index dc38551..7819248 100644
--- a/gemfiles/activerecord_7.2.gemfile
+++ b/gemfiles/activerecord_7.2.gemfile
@@ -4,10 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 7.2"
 gem "activesupport", "~> 7.2"
-<<<<<<< Updated upstream
-gem "standard", "~> 1.16"
-=======
 gem "standard", "~> 1.31"
->>>>>>> Stashed changes
 
 gemspec path: "../"