resolved conflict

2 jobs from aide_a_la_commande in 1 minute 24 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #1393
lint:js

00:22

passed #1394
unit:django

01:01