Merge "Fix disabled merge button on conference failure."