db has changed
dumpy.sql contains all changes made on November, 23
Merge remote-tracking branch 'origin/master'