Here's the stuff we found when you searched for "resolving conflicts"

If you Log in you could create a "resolving conflicts" node. If you don't already have an account, you can register here.