fixed the bug duplicate merge