merge solved