Block ID conflict fix