description merge solved