Resolve conflicts

Status Job ID Name Coverage
  .Pre
passed #2562
install

00:00:35

 
  Test
passed #2564
lint

00:00:30

passed #2563
test

00:00:27

 
  Build
passed #2565
build

00:00:38