readding the src-nconflict dependencies