revert: clarify label on conflict hunks