fixing foreman output
merging envs