resolving bug
Merge branch 'register_item'