update featues to remove conflics6