djanmoto変更
merge