Got rid of .DS_Store"
merge