@neauoire in principle you can do the merge on your local repo, including editing the resolves, with your own editor; then push it. Good type 2 fun.