BACKLOG-5331
- Fix some issues with merging
- Still not "stable", keeps merging profile, somehow the cookies are not stabilizing