update featues to remove conflics