From af9de77818e9aa51cc32bb2aaaa04737740b3acd Mon Sep 17 00:00:00 2001
From: hawyar <hawyarfa@gmail.com>
Date: Wed, 28 Jun 2023 20:59:52 -0400
Subject: [PATCH] Update conflict docs