Git: Resolve a Merge Conflict

Two teammates edited the same line of `~/conflict/README.md`. Merge `feature` into `main` and keep both changes.

Tasks

1. In ~/conflict, merge the feature branch into main.
2. Resolve the conflict keeping both lines, then commit the merge.