Test env merge in context of a stash.
Support conflict detection when merging env.

Closes #25.