mypage c
conflict fixed
mypage d