How to solve git merge conflict, on Github or with terminal HD

How to solve a merge conflict when trying to do a pull request. Github: https://github.com/lingonsaft/hacktoberfest Website: https://hacktoberfest.lingonsaft.com/ Hacktoberfest...