Test data generated from both files separated in 717f03f474
Buildserver auto merge