add generate_subject_map changes
resolve merge conflicts
add xsl transformation changes