diff --git a/HammerTests.podspec b/HammerTests.podspec
index 447491c..79a0951 100644
--- a/HammerTests.podspec
+++ b/HammerTests.podspec
@@ -1,10 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name          = "HammerTests"
-<<<<<<< version-bump
   spec.version       = "0.15.0"
-=======
-  spec.version       = "0.14.4"
->>>>>>> main
   spec.summary       = "iOS touch and keyboard syntheis library for unit tests."
   spec.description   = "Hammer is a touch and keyboard synthesis library for emulating user interaction events. It enables new ways of triggering UI actions in unit tests, replicating a real world environment as much as possible."
   spec.homepage      = "https://github.com/lyft/Hammer"