I use Lazygit too! If you configure ec as git mergetool, you can resolve conflict via ec by open external mergetool in Lazygit.