Delete .DS_Store

error merge