Reverse db_population changes
Merge resolve