Handling Merge Conflics

[s2t2]

Basically when it says there is a conflict and gives you content like this:

<<<<<<< stocks-qc
```
=======
'''
>>>>>>> main

you basically have to choose which to keep. So in this case assuming you changed quotes to backticks and want to keep the backticks, we just keep:

```

We get rid of the <<<< line, the ==== line, and the >>>> line.

[s2t2]

Example conflict:

<<<<<<< stocks-qc
from app.stocks import fetch_stocks_csv, format_usd


def test_usd_formatting():
    assert format_usd(3.5) == "$3.50"
    assert format_usd(0.44444) == "$0.44"
    assert format_usd(123456789) == "$123,456,789.00"
=======
from app.stocks import fetch_stocks_csv
>>>>>>> main

In this example, assuming we added the second import and corresponding test function, we keep the top (above the ====) and remove the bottom (below the ==========)