fixed the merger error