fixes some links of classes
fixes some conflicts