update featues to remove conflics7