Fix merge error in menu