fixed merge error
Enabled verification.