Fix conflict

3 jobs from jdorman632 in 3 minutes and 53 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Lint
passed #15542
lint

00:01:08

 
  Build
passed #15543
build

00:01:29

 
  Test
passed #15544
test

00:01:15