code over, prepare for debug
fix conflict
prepare for debug