As soon as you got to those markings that appeared all the sudden at the end you were doomed. My hardware v2.5 is easily overwhelmed if the unexpected happens.
Now if those marks had been the entire length of the merge point, it's 98% certain it would have merged correctly.