Moving to Keystone v3
fix merge conflict