fix merge conflict

2 jobs from 2844-bdm-admin-shifts-template in 1 minute 30 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #3354
lint:js

00:22

passed #3355
unit:django

01:08