Update the database again
Merge origin/master