fix merge conflict

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

00:21

passed #3000
unit:django

01:06