pre dev merge conflicts

client/package.json

client/src/actions/cities.ts

client/src/actions/competitions.ts

client/src/actions/editor.ts

client/src/actions/presentation.ts

client/src/actions/roles.ts

client/src/actions/searchUser.ts

client/src/actions/statistics.ts

client/src/actions/types.ts

client/src/actions/typesAction.ts

client/src/actions/user.ts

client/src/pages/admin/AdminPage.tsx

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

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

...pages/admin/dashboard/components/NumberOfCompetitions.tsx

.../src/pages/admin/dashboard/components/NumberOfRegions.tsx

...nt/src/pages/admin/dashboard/components/NumberOfUsers.tsx

client/src/pages/admin/regions/AddRegion.tsx

client/src/pages/admin/regions/Regions.tsx

client/src/pages/admin/users/AddUser.tsx