Merging as is, although further changes may be required. Specifically, the placement in the menu structure.