fix env snafu
fix merge conflict