diff --git a/Gemfile.lock b/Gemfile.lock
index 821a38af..3319d8df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -235,14 +235,21 @@ GEM
       net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.3.3)
       net-protocol
+<<<<<<< HEAD
     net-ssh (7.1.0)
     newrelic_rpm (9.1.0)
     nio4r (2.5.9)
     nokogiri (1.14.2-arm64-darwin)
+=======
+    net-ssh (7.0.1)
+    newrelic_rpm (8.16.0)
+    nio4r (2.5.8)
+    nokogiri (1.15.2-arm64-darwin)
+>>>>>>> 151dbb2 (updated Nokogiri as part of security vulnerability and adding updated file Gemfile.lock)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -264,7 +271,7 @@ GEM
     public_suffix (5.0.1)
     puma (6.2.1)
       nio4r (~> 2.0)
-    racc (1.6.2)
+    racc (1.7.1)
     rack (2.2.6.4)
     rack-livereload (0.3.17)
       rack