Fix getting an overlapping merge