How to resolve merge conflicts via the command line created by trying to integrate the license-maintainer?

So I got merge conflicts on several files with a pull request [here](https://github.com/Drops-of-Diamond/diamond_drops/pull/38). [Here](https://github.com/Drops-of-Diamond/diamond_drops/pull/38.patch) is the patch diff. I'm not sure how to resolve this, following the instructions to resolve the conflicts via the command line didn't help.