re add because of conflict