Partial progress random generators
Fixed b0rked merge