added 2 methods to the merger. Re-enabled prototypes