local commit
local
disable simplecov
local change to user.rb
local change
Merge branch 'master' of github.com:Eclipse932/SyncUp_backend

merge conflict
Merge branch 'master' of github.com:Eclipse932/SyncUp_backend

merge conflict
local change
local change
Merge branch 'master' of github.com:Eclipse932/SyncUp_backend

merge conflict
local change
 fix an error in activity_controller