fixed conflict on knockout_stage