db resynced
merged with master