# Pastebin Ev61eEOM
First, rewinding head to replay your work on top of it...
Applying: Nuage nova configuration ansible changes
Using index info to reconstruct a base tree...
M       defaults/main.yml
M       templates/nova.conf.j2
Falling back to patching base and 3-way merge...
Auto-merging templates/nova.conf.j2
Auto-merging defaults/main.yml
CONFLICT (content): Merge conflict in defaults/main.yml
Failed to merge in the changes.
Patch failed at 0001 Nuage nova configuration ansible changes
The copy of the patch that failed is found in:
   /home/rohanp/NOVA-RSPACE-NUAGE-UPSTREAM/openstack-ansible-os_nova/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".