Merge 오류내용 수정