reset branch
Merge remote-tracking branch 'origin/master'

* origin/master:
  meger code
  commit but not push
  delete file
test