Clean up merge resolution markup I missed before.