Merge menu fix