Merging 추가부분(130531)