Conflict
Conflict was resolved