diff --git a/modules/imaging_browser/php/viewsession.class.inc b/modules/imaging_browser/php/viewsession.class.inc
index 62c0875e183..ecaf14e1113 100644
--- a/modules/imaging_browser/php/viewsession.class.inc
+++ b/modules/imaging_browser/php/viewsession.class.inc
@@ -51,6 +51,7 @@ class ViewSession extends \NDB_Form
         /* User has access if they have an 'all site' permission or if they are
         * part of a study site and are permitted to view their own site.
          */
+<<<<<<< 9e130744c807fee9c768f3ff84ccbd7e98d972af
 <<<<<<< 727643d319286c29f66ca88ebb55aed880e258d7
         $session   = \TimePoint::singleton(
             new \SessionID(strval($_REQUEST['sessionID']))
@@ -61,6 +62,16 @@ class ViewSession extends \NDB_Form
             new \SessionID(strval($_REQUEST['sessionID']))
         )->getCandID();
 >>>>>>> Use the SessionID class in LORIS (#5352)
+=======
+<<<<<<< 59cb1d14608d02b18229379250cb76f08341102a
+        $candid    = \TimePoint::singleton(
+            new \SessionID(strval($_REQUEST['sessionID']))
+        )->getCandID();
+=======
+        $session   = \TimePoint::singleton($_REQUEST['sessionID']);
+        $candid    = $session->getCandID();
+>>>>>>> [Imaging_browser] Access to view session based on session project (#6888)
+>>>>>>> [Imaging_browser] Access to view session based on session project (#6888)
         $candidate = \Candidate::singleton($candid);
 
         if ($candidate->getData('Entity_type') == 'Scanner') {