Add item detail feature
Merge conflict