rm DS_Store file
merge