Redo Account Merging

Attempt to fix issue #228