Revert "Revert "margeに対応""

This reverts commit 6f67353ae5e48d07abb0004ece850bac5f90ac1b.