typo fix
Working on delete
Merge branch 'tngyn-branch'
Merge conflict