Adjusting devstack run
Resolving conflicts