Truncated history
merge