fixed merge conflict
revised deletes