Actually resolving conflicts.