Fix unresolved conflicts in update_dependencies.xml.