changed org views to partials
edited org show view
m conflict