Just wondering what kind of tools/strategies/flow do you use for resolving merge conflicts?