search함수 삭제& conflict 수정 #12

Closed Juheon17 closed 2 years ago