config env dev and production
fix mergin