Allow environment to be checked via App::environment method.
fix merge conflicts.