updates env files
merge fixes