Yeah, I tried not tearing down the toolbar buttons and not calling setupSaveDialog but it didn't work properly, possibly because some logic needs to happen to check whether to show the "resolve conflict" button based on the content in the surface.  Basically, all three buttons show up and events were not bound properly.