local edit 3 sql enum
Revert "local edit 3 sql enum"

This reverts commit 85fc6b979af01b43fbdacb39039e2e4db0ccd0fe.
local edit 3 sql enum
Resolved conflicts
Resolved conflict 3