Just fixed conflict

in PreferenceVA