african-styles - initial commit
african style - conflict resolution