resolve merge conflict

src/components/Header.js

src/components/Header.module.css

src/components/infiniteScroll.js

src/components/mypage/my_group.module.css

src/components/mypage/mywritingModal.module.css

src/components/recruit/my_recruitList.js

src/components/recruit/my_recruitList.module.css

src/components/search.js

src/pages/mypage.js

src/pages/mypage.module.css