log truncated changed
merge