Fix post-merge conflicts

[atugushev]

Addresses #824 (comment).

[codecov]

Codecov Report

Merging #1086 into master will increase coverage by 0.00%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1086   +/-   ##
=======================================
  Coverage   99.41%   99.42%           
=======================================
  Files          34       34           
  Lines        2411     2443   +32     
  Branches      297      302    +5     
=======================================
+ Hits         2397     2429   +32     
  Misses          8        8           
  Partials        6        6           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c4dcaf7...f0d4827. Read the comment docs.

[atugushev]

@camilonova thanks!

[camilonova]

@atugushev Thanks to you pal 🍺