string formatting done (try fixing all syntax errors)

[yashagg2001]

Trying to solve the issue (old string formatting replaced by new f-string formatting) once again.

[andrewfullard]

You have left in merge lines ======= etc. This is also incorrect syntax.

[codecov]

Codecov Report

Merging #1450 (088de08) into master (c60673b) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1450      +/-   ##
==========================================
- Coverage   69.06%   69.05%   -0.01%     
==========================================
  Files          68       68              
  Lines        6106     6108       +2     
==========================================
+ Hits         4217     4218       +1     
- Misses       1889     1890       +1     

Impacted Files	Coverage Δ
tardis/tardis/montecarlo/spectrum.py	70.90% <0.00%> (-0.79%)	⬇️
tardis/tardis/io/decay.py	90.16% <0.00%> (ø)
tardis/tardis/util/base.py	77.77% <0.00%> (ø)
tardis/tardis/plasma/base.py	56.17% <0.00%> (ø)
tardis/tardis/io/model_reader.py	97.70% <0.00%> (ø)
tardis/tardis/simulation/base.py	85.71% <0.00%> (ø)
tardis/tardis/io/atom_data/base.py	90.80% <0.00%> (ø)
tardis/tardis/io/atom_data/util.py	47.05% <0.00%> (ø)
tardis/tardis/plasma/exceptions.py	87.50% <0.00%> (ø)
tardis/tardis/io/config_internal.py	34.48% <0.00%> (ø)
... and 4 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c60673b...088de08. Read the comment docs.

[andrewfullard]

Please follow the code quality guidelines at https://tardis-sn.github.io/tardis/development/code_quality.html so that the checks all pass

[andrewfullard]

Please resolve the conflicts in
docs/conf.py
tardis/widgets/shell_info.py

[yashagg2001]

I am unable to see any conflicts in these files. Please tell me how to resolve it.