worked on return items function
Fixing merge conflicts