Fixes the alphabetization

Because I'm a dork like that :-P
fixed conflict