fix merge conflict

2 jobs from ticket_1673 in 1 minute 33 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2113
lint:js

00:24

passed #2114
unit:django

01:08