Save local changes before resolving merge conflict

package-lock.json

package.json

src/App.js

src/notofonts.ttf

src/pages/Header.js

src/pages/createRecruitment.js

src/pages/join.js

src/pages/join.module.css

src/pages/login.js

src/pages/mainAside.js

src/pages/recruit.js