more update
fixed conflict