手动输入查询修改
removed .DS_Store file
merged the conflicts