update featues to remove conflics5