commiting ds store
fixing merge