merge remote dev
update databse config