fix merge conflict with dev

2 jobs from evolution_bdm in 1 minute 39 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #1716
lint:js

00:21

passed #1717
unit:django

01:18