review fix: fixed merge error, added comment
Merge branch 'feature/upload_state_on_signup'