Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay!
Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. [This support page](https://help.github.com/en/articles/resolving-a-merge-conflict-on-github) was helpful. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay!
