Revert "パズドラときてれつがコンフリクト"

This reverts commit 17deeb4094f97717c131693956e7c2c5c4812300, reversing
changes made to 4659c239d9230459dc3d9b69b001476af164de82.