Yesterday, I encountered a commit conflict while fetching from my upstream. In my limited knowledge, I deleted the file with the commit conflict from my vs code. Now, I tried to fetch from my upstream with the hope that I’ll still have access to the file but I could not find it. I also observed that the background colour of my branch in my terminal switched from yellow to green. How do I resolve this? I’m a beginner so, I am freaking out already.