fixing the merge behavior for our one hard-coded case