Fix merge tooltips