resolve conflict
fix bug
�v���O�C���ǂݍ���łȂ�����