Working on merging changes when recency errors are signalled re ADWolf:#1207 (3)
Auto merge recency-errors

instead of failing because of a recency error, do our best to resolve
any errors we can, save if we changed anything and then raise
merge-conflicts that still exist
fixed test/live fun overlap
removed duplicate test definition
better signalling of merges re ADWolf:#1207
removed false assertion in test