some changes I can not undo
resolving conflict
Fixed check_king_status