From 67702202af8cf1a7834a841d2231c676411dc04a Mon Sep 17 00:00:00 2001
From: KevIsDev <102023614+xKevIsDev@users.noreply.github.com>
Date: Fri, 21 Feb 2025 18:23:48 +0000
Subject: [PATCH] Revert "feat: diff-view-v2-no-conflict"