Additional logic to prevent merging in the wrong direction.
v1.6