removed ds store to fix merge conflict