update conflict

Signed-off-by: jimmy <jaychou19910110@126.com>