fix merge and change db shema