merge topshelf.demo