resolve conflict

diff --combined Changes
index 64693c0,452584f..61c4c79
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,9 -1,6 +1,10 @@@
  # This file documents the revision history for Perl extension Catalyst.
  
 -  - Add test that env does not get trampled (Arthur Axel fREW Schmidt)
 +5.90099 - 2015-08-XX
 +  - Document using namespace::autoclean with controllers that have actions
 +    with type constraints.
 +  - Look for type constraints in super classes and consumed roles.
++  - Change the way the stash middleware works to no longer localize $psgi_env.
  
  5.90098 - 2015-08-11
    - Fix for RT#106373 (Issue when you try to install and also have an old

diff --combined lib/Catalyst/Middleware/Stash.pm
index 4682da8,4682da8..f874810
--- 1/lib/Catalyst/Middleware/Stash.pm
--- 2/lib/Catalyst/Middleware/Stash.pm
+++ b/lib/Catalyst/Middleware/Stash.pm
@@@ -43,8 -43,8 +43,8 @@@ sub call 
    my $new_env = +{ %$env };
    my %stash = %{ ($env->{+PSGI_KEY} || sub {})->() || +{} };
  
--  $new_env->{+PSGI_KEY} = _create_stash( \%stash  );
--  return $self->app->($new_env);
++  $env->{+PSGI_KEY} = _create_stash( \%stash  );
++  return $self->app->($env);
  }
  
  =head1 NAME