pr merge updates