Resolves conflicts.