diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24fca20..6b68f82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ Changelog
 0.5.0
 -----
 
+0.4.1
+-----
+* Updated database_cleaner gem
+
 0.4.0
 -----
 * Rails 4 rc2
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c6b0fe..eaefc65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 GIT
   remote: git://github.com/bmabey/database_cleaner.git
   revision: 20136e8987c222013d96e07c27d1230d2bbebd61
@@ -5,6 +6,8 @@ GIT
   specs:
     database_cleaner (0.9.1)
 
+=======
+>>>>>>> hotfix/0.4.1
 GEM
   remote: https://rubygems.org/
   specs: