[#6229] add merge commit to test data
5 files changed