fixed merge issues with dashboard - still no photos