Removed db.
Merged remote changes