different attendess
fixed conflict