solved conflict
fixed terminate bug