The announced merger of Six Flags and Cedar Fair will bring two iconic Southern California theme parks, Magic Mountain and Knott's Berry Farm, under the same ownership.