fix a bug during branch merge