fault from merge solved