fix conflict

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

00:21

passed #1670
unit:django

01:00