removed old case desc.
Fixed merge conflict