resolving conflict with ofir