fix merged problem