diff --git a/Gemfile.lock b/Gemfile.lock
index 853565de..08a64f2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,7 +75,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
+<<<<<<< HEAD
     commonjs (0.2.6)
+=======
+>>>>>>> master
     cucumber (1.3.5)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)