Revert "衝突してない判定も修正"

This reverts commit 5820cfd57a2c62da2b11078f004ac0949fba0014.