MAP-552:  Fixed problem with Finish/Next causing tool hanging
Improved/fixed conflict generator for ICD10
Modified toString() in mapEntry to prevent null pointer exceptions.