fix merge conflict

1 job from dev_cooperatic in 20 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #893
lint:js

00:20