[fix] unable to merge branches
[fix] unable to merge branches

mizoki/shirasagi,sunny4381/shirasagi,tany/ss,ShinjiTanimoto/shirasagi,ShinjiTanimoto/shirasagi,mizoki/shirasagi,MasakiInaya/shirasagi,ShinjiTanimoto/shirasagi,itowtips/shirasagi,sunny4381/shirasagi,shirasagi/ss-handson,itowtips/shirasagi,MasakiInaya/shirasagi,shirasagi/shirasagi,sunny4381/shirasagi,MasakiInaya/shirasagi,shirasagi/shirasagi,tany/ss,itowtips/shirasagi,mizoki/shirasagi,ShinjiTanimoto/shirasagi,tany/ss,mizoki/shirasagi,shirasagi/shirasagi,sunny4381/shirasagi,shirasagi/ss-handson,itowtips/shirasagi,MasakiInaya/shirasagi,shirasagi/ss-handson,tany/ss,shirasagi/shirasagi,shirasagi/ss-handson