Dailymaverick logo

Conflict resolution