#coding

Resolve Git local changes to the following files would be overwritten

I ran into a new conflict using git today that took a bit of wrangling 🤠 "𝗬𝗼𝘂𝗿 𝗹𝗼𝗰𝗮𝗹 𝗰𝗵𝗮𝗻𝗴𝗲𝘀 𝘁𝗼 𝘁𝗵𝗲 𝗳𝗼𝗹𝗹𝗼𝘄𝗶𝗻𝗴 𝗳𝗶𝗹𝗲𝘀 𝘄𝗼𝘂𝗹𝗱 𝗯𝗲 𝗼𝘃𝗲𝗿𝘄𝗿𝗶𝘁𝘁𝗲𝗻 𝗯𝘆 𝗺𝗲𝗿𝗴𝗲" I didn't have any changes to commit loca...