#18: Changes in MergeExecutor reverted.
#18: MergeAborted exception class removed (never thrown)