rm the from file
Merge branch 'dev'

* dev:
  rm the from file