fix merg Bugs