readded main menu after failed merge