Merge history test 2