line missing from merge