I have the exact same woes with Grassa too... This would be welcomed!

Just make the merge/collapse optional, pretty much like many other actions that turns into the other one.