Merge in changes