modified description
solution; conflict