a1edebf
resolve: drop unnecessary else, and add short comment (cherry picked from commit 4b2ceb8a48c3aeef4147e335b5f31bc2ed4aa6fb)