correction for merge

src/Template/Element/ProjectPage/screenShotsList.ctp

@@ -16,7 +16,7 @@
     <?php foreach ($project->screenshots as $screenshot): ?>
         <li>
             <div class="col-sm-9 col-md-2 screenShot">
-                <?= $this->Html->image(WEBROOT_SERVER.$project->url_directory.DS.$project->photo, ['alt' => $screenshot->photo,'class' => 'img-responsive']) ?>
+                <?= $this->Html->image(WEBROOT_SERVER.$screenshot->url_directory.DS.$screenshot->photo, ['alt' => $screenshot->photo,'class' => 'img-responsive']) ?>
 
             </div>
         </li>