handling merge conflict
adding deleted files