finishing up post-merge updates