The WB/Discovery Merger