fixed the incorrect merge