remove Conflicts and implemenet Link::make