adding organization
resolving conflict