resolve merge conflicts — force merge all conflicts (show dialog until all conflicts are not merged)