merge fixes

industrial:white_brick
gloopblocks:evil_stick