fix merge conflict

2 jobs from 2827-print-from-inv in 1 minute 28 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3506
lint:js

00:20

passed #3507
unit:django

01:07