fix mergin bug