fixed merge conflict in setup_state.js