Resolve conflicts for OpenStack.