Merge with remote and hopefully fixed database