Creating another conflict
Resolved the other conflict