Handling Conflict within the Partnership