resolve conflict
resolve conflict
fixed bug