Merge conflicts

- - [ ] Add basic merge conflict handling in the [Merge Conflicts section](https://harshkapadia2.github.io/git_basics/#_merge_conflicts).
- During a merge conflict, `git status -s` gives output `UU` (both in red) for files that are conflicted.
- What is the meaning?
- - [ ] Add it to the [`-s or --short` flag](https://harshkapadia2.github.io/git_basics/#_s_or_short).
- [Resolving a Git conflict with binary files](https://stackoverflow.com/questions/278081/resolving-a-git-conflict-with-binary-files)
- - [ ] Add `--ours` and `--theirs` to [`git checkout`](https://harshkapadia2.github.io/git_basics/#_git_checkout) with a reference to https://github.com/HarshKapadia2/git_internals.
- - [ ] Write a small article on this in the [General #2 section](https://harshkapadia2.github.io/git_basics/#_general_2).
- - [ ] Refer to this in https://github.com/HarshKapadia2/git_internals.