Resolving Structural Conflicts