diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1038792..f18d77d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,3 @@
 # Change Log
-All notable changes to this project will be documented in this file.
-`Hammer` adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.9.1](https://github.com/lyft/Hammer/releases/tag/0.9.1)
-- Add Makefile
-- Add swiftlint
-- Add new docs
-
-## [0.9.0](https://github.com/lyft/Hammer/releases/tag/0.9.0)
-- Initial release
+Changes can be found here: https://github.com/lyft/Hammer/releases
\ No newline at end of file
diff --git a/HammerTests.podspec b/HammerTests.podspec
index 5343ad2..447491c 100644
--- a/HammerTests.podspec
+++ b/HammerTests.podspec
@@ -1,6 +1,10 @@
 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"