Propagate conflicts on end transaction.
Merge remote-tracking branch 'origin/pr/542'