changed the hyphens to match the original
resolved mergconflicts