smooth differences between merges