added additional descriptive text
fixed conflict