Cleanup after rebase full of conflicts