ENV bug fix.
issue's clear.
conflicts fix.