fix(menuBar): solved conflict
fix(menuBar): solved conflict

QubizSolutions/quiz-engine,RoxanaAnghel/quiz-engine,QubizSolutions/quiz-engine,QubizSolutions/quiz-engine,RoxanaAnghel/quiz-engine,MarianCristian/quiz-engine,MarianCristian/quiz-engine,MarianCristian/quiz-engine,RoxanaAnghel/quiz-engine,QubizSolutions/quiz-engine,RoxanaAnghel/quiz-engine,RoxanaAnghel/quiz-engine,MarianCristian/quiz-engine,MarianCristian/quiz-engine,QubizSolutions/quiz-engine