merge conflict

.gitlab-ci.yml

.prettierrc

assets/admin/js/vendor/jquery/jquery.js

assets/css/custom.css

assets/js/AdminVacancyPage.jsx

assets/js/ApplicantPage.jsx

assets/js/CompanyPage.jsx

assets/js/CompanyProfile.jsx

assets/js/CreateVacancy.jsx

assets/js/Dashboard.jsx

assets/js/EditProfile.jsx

assets/js/Login.jsx

assets/js/NotificationPage.jsx

assets/js/ProfilePage.jsx

assets/js/SupervisorPage.jsx

assets/js/TranscriptPage.jsx

assets/js/VacancyPage.jsx

assets/js/__test__/ApplicantPage-test.jsx

assets/js/__test__/CompanyPage-test.jsx

assets/js/__test__/CompanyProfile-test.jsx