Merged version