clean comment
resolve conflict env_enviroment