fix merge conflict

2 jobs from 2420-regular-shift-admin in 1 minute 30 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #3031
lint:js

00:21

passed #3032
unit:django

01:08