rebuild Remove, Add
conflict fix