Use diffs for resolution with git apply
Merge branch 'master' of github.com:citrix-openstack/qa