fix bug:
resolve conflict