Fixed database again.
Fixed merge conflicts.