Update fix conflict branch

[jdebacker]

No description provided.

[codecov]

Codecov Report

Merging #2672 (c37e14e) into its_merge_conflict_fix (cd37b7f) will increase coverage by 0.07%.
The diff coverage is 100.00%.

Additional details and impacted files

@@                    Coverage Diff                     @@
##           its_merge_conflict_fix    #2672      +/-   ##
==========================================================
+ Coverage                   98.47%   98.54%   +0.07%     
==========================================================
  Files                          14       14              
  Lines                        2616     2609       -7     
==========================================================
- Hits                         2576     2571       -5     
+ Misses                         40       38       -2     

Flag	Coverage Δ
unittests	98.54% <100.00%> (+0.07%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
taxcalc/parameters.py	100.00% <ø> (+0.68%)	⬆️
taxcalc/__init__.py	100.00% <100.00%> (ø)
taxcalc/utils.py	97.79% <100.00%> (ø)