Popping up the login stuff in a modal.
Accepting the merge difference.