Conflict fixing?

??