Worked on checking out items
Fixing conflicts