Conflict?
Conflict fixed