fix merge중 여러개 수정 #178

Closed sungminyun1 closed 2 years ago