Use correct tokens when merging users
ditto for login-and-link
firebase rules and deployment helper