Fixed version conflicts