Merging in Recent Changes