when a buffer is too long to fit in the two page limit, truncate it instead of just dropping it
merge conflicts
merge dev