Add okay to merge tooltip

Fixes #491