What happened to the merging tool?

Several merge prompts popped up with conflicts (mostly dealing with the Theming preview from last week).  I chose 'Rest Accept', and went to press the Merge button.

Except it wasn't active.

I can't merge anymore!

Is anyone else suffering this, or did I get into an odd location somehow?

Thanks,

cbc