Proper merge env