re add
resolve fetch and merge