fix aliases after botched merge