fix rebase

file had also been refactored for better language support
but that is irrelevant with feature-langs