Do you work on a duplicate theme or directly on the live store?
We do all the conflict hunting on a duplicate (unpublished) theme so the live storefront is never at risk while we disable and re-enable apps. We need collaborator access to your store so we can create that duplicate and read the app list; we publish the fixed theme only after you sign off. If you cannot grant collaborator access, we can guide you through the steps over a screen-share.