fix leaving merge issue