Dispute between firefighter, fire company is resolved