fixed merge confilcts
more merge conflicts
refactor item-based, take out join