Generating a conflict to resolve