Trying to fix conflicts

I don’t think I like the GitHub app.