THISTED-5 - Fix conflict in feature.