merge a number of changes