fixed compiliation errors from merge. semantic errors found in diffLine when testing