Rebase conflicts currently uses a app/src/ui/rebase/conflict-files-list.tsx component to render it's items. This should be combined with the work done around resolving manual conflicts in #6777 and #6821 which is now contained in app/src/ui/merge-conflicts/unmerged-file.tsx.

There are some differences that need to be thought about:

• unmerged-file.tsx takes in ourBranch and theirBranch as props - we need to think about what makes sense to show for these options when handling conflicts
• probably some other things