Merge in the changes