fix merge conflict

2 jobs from ticket_2473 in 1 minute 29 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #2947
lint:js

00:21

passed #2948
unit:django

01:07