Fixed a logic bug in non-merging cases.
Fixed a logic bug in non-merging cases.

bsn069/upb,bsn069/upb,tempbottle/upb,tbetbetbe/upb,tbetbetbe/upb,bsn069/upb,tempbottle/upb,tempbottle/upb,tbetbetbe/upb,tempbottle/upb,tbetbetbe/upb,tbetbetbe/upb,bsn069/upb,tempbottle/upb,bsn069/upb