Tackling conflicts, testing, style changes since @johnsondnz raised
a MR for his overhaul