update featues to remove conflics3