History tests/merge/conflict_data.h