Better UX
Merge