Resolve conflicts dialog nearly done. Need to handle the actual selections now in the controller.