resolve the dependency conflicts