Simulating conflict b

Simulating conflict b