Adding env var
resolving conflits