Revert "#1"

This reverts commit 082a0de3b83bf629c3d687f0873eff19e9af0469.
Revert "Revert "#1""

This reverts commit 02877a900346a49958d780d01196e95a97e4fbe5.
fix merge bug
complete slide