A couple merge conflicts that I missed.