mypage updated
merge