Options for resolving conflicts