With no movement a year after plans were announced, the companies have walked away from the merger and litigation has been dismissed.