diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index a17c5c84d..ccf155a92 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -1,5 +1,5 @@
 module Mobile
-
+  require_relative 'middleware/error_handler'
   class API < Grape::API
     version 'v1', using: :path
     format :json
@@ -33,7 +33,7 @@ module Mobile
     mount Apis::Homeworks
 
     #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
-     add_swagger_documentation ({api_version: 'v1', base_path: '/api'}) if Rails.env.devlopment?
+     add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 74ba6d652..98476f9dd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,7 +12,6 @@
 # It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 20150123020615) do
->>>>>>> szzh
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false