Post-merge updates