Explicit login seems to work best. Rewrote merging logic