update featues to remove conflics4