changes that should produce a conflict