removed ds store
merged files