rebuild Remove, Add finished
conflict fix