fixed deleted change
Merge branch 'dev'