removed conflicting records for update design and enhanced sql statements for ignoring lines