Resolve merge + add menu students and promotions