resolve pull conflicts

client/package-lock.json

client/package.json

client/src/Main.tsx

client/src/actions/competitionLogin.ts

client/src/actions/types.ts

client/src/pages/admin/competitions/CompetitionManager.tsx

.../pages/presentationEditor/PresentationEditorPage.test.tsx

...t/src/pages/presentationEditor/PresentationEditorPage.tsx

client/src/pages/presentationEditor/styled.tsx

client/src/pages/views/AudienceViewPage.tsx

client/src/pages/views/OperatorViewPage.tsx

client/src/pages/views/TeamViewPage.tsx

client/src/pages/views/ViewSelectPage.tsx

...t/src/pages/views/components/JudgeScoringInstructions.tsx

client/src/reducers/competitionLoginReducer.ts

client/src/utils/SecureRoute.tsx

client/src/utils/checkAuthenticationCompetition.ts

server/app/apis/codes.py

server/app/apis/slides.py