added mazeblocks
resolved conflict