resolving merge conflicts

*fingers crossed*

I admit I’m not exactly sure how this works… Let’s see if I did the
right thing.