Added Delete File
fixed merge conflict