fixed mac database
merged local files