update featues to remove conflics8