Resolve conflict in cinder-manage patch.