fixed confliting frameworks