fix merge conflict

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

00:22

passed #1739
unit:django

01:01