Attempting to conflict
Added partner name
Merge Conflicts