Merging in changes