resolve merge conflict

src/components/channel/channelList.js

src/components/channel/channelList.module.css

src/components/channel/createChannel.js

src/components/channel/existingChannel.js

src/components/infiniteScroll.js

src/components/mypage/my_editModal.js

src/components/mypage/my_editModal.module.css

src/components/mypage/my_group.js

src/components/mypage/my_infoModal.js

src/components/mypage/mywritingModal.js

src/pages/mypage.js

src/pages/mypage.module.css