fix : merge 오류 해결 #89

Closed alstn113 closed 2 years ago