Add guard for division by zero
Resolution de merge