Revert "First commit"

This reverts commit 3e0ec3d6371e2e83a684ff7b74fd659f837391ba.
fix merge error in Drain's computer