머지
충돌 정리
updated lotto
Pull from upstream and push to origin