rando log changes
merge errorz