last sentence update
fixed conflict