Propagate conflicts on TransactionEnd.

Also refactored conflict exceptions.
Fixes #374