Questions about local modifications conflict

I just did the upgrade to 2.0.7. I now have some conflict from local modifications to files that I have never even touched. What am I supposed to do with this? When I look at the changes using the “changes” link, it shows me something in red and something in green. I downloaded some of the files and it looks like they are using the latest code. I am just confused as to what exactly I am supposed to do here. Can someone point me in the right direction?

Same question here

haven’t any idea what this means

Anyone ?

If you haven’t made any modifications to the particular file then ignore it. It has installed the newest file. The changes are just a reference incase you did make your own changes.