fixing setting env maybe
not reading env
not geting env properly
Merge branch 'dev'