Merge mcstair into mcl_stairs