merge with august spring but merge fail

config/routes.rb

@@ -347,6 +347,7 @@ Rails.application.routes.draw do
     post 'save_stock' => 'stock_checks#create', as:'stock_check_save'
     get '/stock_checks/:id' => 'stock_checks#show'
     post 'save_to_journal' => 'stock_checks#save_to_journal', as: 'save_to_journal'
+    post 'print_stock_check' => 'stock_checks#print_stock_check', as: 'print_stock_check'
     # resources :stock_checks
     resources :stock_journals
     resources :inventory_definitions