Minor update
fixed conflict