Resolves merge conflicts

Fuck you dylan