Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged common/widgets.py
CONFLICT (content): Merge conflict in common/widgets.py
Failed to merge in the changes.
Patch failed at 0001.

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