Made account merge smarter