Fixed error in activity main menu caused by merge