merge updates