https://github.com/JogongGift/Jogong_test/commit/f2540da5974d2fdb5374152f1a55959571151c5d
충돌 해결 후 푸쉬