Changed the way to calculate warranty remaining.
Fixed conflicts