Created POTENTIAL (it will be a) conflict
Fixed conflict
Fixed second conflict