Fix off-by-one in new three-way-merge updates