Merge updates to stay current