removing conflict annotation from pipeline_mapping.py
removing conflict annotation from pipeline_mapping.py

CGATOxford/CGATPipelines,AntonioJBT/CGATPipeline_core,CGATOxford/CGATPipelines,AntonioJBT/CGATPipeline_core,AntonioJBT/CGATPipeline_core,CGATOxford/CGATPipelines,AntonioJBT/CGATPipeline_core,CGATOxford/CGATPipelines,CGATOxford/CGATPipelines