fix merge conflict

Status Job ID Name Coverage
  Test
passed #3576
lint:js

00:31

passed #3577
unit:django

01:40