more changes on <<
merged with changes from office