I have routinely used the (excellent) Intellij/Pycharm "Resolve Conflicts" available by right clicking in any source file in the project and accessing from the &qu
