I'm apparently an idiot who can't resolve a merge conflict correctly...