remove conflict
fixed fetch error