Tweaks to Account Merge Along With Error Handling