Merging conflicting files.
DB schema updates.
Convert strings to dictionary if needed.
Use literal_eval here.
Fixed some bugs.
Small changes to make the file look exactly as the upstream one.
This looks reasonable as long as we don't have notaries and arbiters.
Wait 2 seconds to make sure the db has been created.