Remove duplicate shelf_mark
Merge branch 'refactor' into merge