changing db structure
fix merge