Post-merge with cleanup