merge resolve
env config