Trying to resolve merge conflicts in fork, and what I should do these days. | OpenWeatherMap and NWS fork

[Gatorzgaming]

Its been a while since I have touched this project, I reset my PC in that time so i'll need to clone my copy from source. Was trying to sync it to the main fork but was getting merge conflicts. Never really learned how to use the git console other than git clone. Its spaghetti code that maybe I should just trash but if anyone is willing to take a look its here: https://github.com/Gatorzgaming/weather . Sorry if this is the wrong place to ask - Gatorz