solve unstable merge