Fix conflict

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

00:21

passed #3469
unit:django

01:08