Added the dummy shelf.
Fixed a conflict.