Comment by Nezteb

Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...