fixed the conflicts by the obsolete bundle
updated dependencies