wtf?
Resolved conflicts.
Not sure what I've changed, but the current branch is outdated.