resolved conflicts
Pathways browse page