Fix...

Again. I'm not understanding merging forks, I guess. If someone could simplify it for me, that'd be fantastic.