prefer lineage with least non-merge commits
Merge branch 'make-work-with-different-data'