update featues to remove conflics2