So the last step in this process was getting my code merged, but there were conflicts! I found some helpful guides that walked me through the process that I wanted to note down. The first was an article called Resolving a merge conflict using the command line. This guide was pretty straightforward and provided me with most of that I needed to do. The step though they don’t mention is that before you can sync your fork with an upstream repository, you must configure a remote that points to the upstream repository in Git. Sagarpreet also proveded a link that was helpful called Resolving Pull Request merge conflicts.
