This is almost certainly a user error but I keep hitting a problem when I try to merge changes back into the ‘master’ branch.
All code conflicts are flagged correctly and can be resolved in the code editor without issue. 
However, I get the error message below when I try to resolve the issues with
server_code/requirements.txt
This is what I get when I click ‘yes’
The issue could be that there are no differences in what’s in requirements.txt: modules were removed and reinstalled while troubleshooting and rolling back the code*.
Line 2
-openai
Line 7
-stripe
+stripe
+openai
When I try to click on the links for lines 2 & 7, I get an error that these no longer exist.
Any suggestions are appreciated with the proviso that I am right at the edge of my technical ability here so please use small words.
(I’ve checked the forums for other posts referencing this kind of error but have struck out - apologies if this has already been answered elsewhere.)
I’m not saying the uninstall / reinstall part was a good idea but it’s been an emotional 24-hours… 