fixed conflict after merch dev for current shop

Gemfile.lock

@@ -46,6 +46,9 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    acts_as_tenant (0.4.4)
+      rails (>= 4.0)
+      request_store (>= 1.0.5)
     aescrypt (1.0.0)
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
@@ -219,6 +222,8 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     redis (3.3.5)
+    request_store (1.4.1)
+      rack (>= 1.4)
     roo (1.13.2)
       nokogiri
       rubyzip
@@ -271,8 +276,7 @@ GEM
       activemodel (>= 5.0)
     spreadsheet (1.2.5)
       ruby-ole (>= 1.0)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spring (2.1.0)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
@@ -316,6 +320,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts_as_tenant
   aescrypt
   axlsx (= 2.0.1)
   axlsx_rails