diff --git a/modules/downloadfullsize/controllers/admin_downloadfullsize.php b/modules/downloadfullsize/controllers/admin_downloadfullsize.php
index 563fc7fc..33f8074b 100644
--- a/modules/downloadfullsize/controllers/admin_downloadfullsize.php
+++ b/modules/downloadfullsize/controllers/admin_downloadfullsize.php
@@ -28,6 +28,7 @@ class Admin_DownloadFullsize_Controller extends Admin_Controller {
   }
 
   public function saveprefs() {
+<<<<<<< HEAD:modules/downloadfullsize/controllers/admin_downloadfullsize.php
     // This probably does something important.
     access::verify_csrf();
 
@@ -36,6 +37,16 @@ class Admin_DownloadFullsize_Controller extends Admin_Controller {
     $tButton = false;
     $fButton = false;
     for ($i=0; $i<count($dlLinks_array); $i++) { 
+=======
+    // Prevent Cross Site Request Forgery
+    access::verify_csrf();
+
+    // Figure out which boxes where checked
+    $dlLinks_array = Input::instance()->post("DownloadLinkOptions");
+    $tButton = false;
+    $fButton = false;
+    for ($i = 0; $i < count($dlLinks_array); $i++) {
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/controllers/admin_downloadfullsize.php
       if ($dlLinks_array[$i] == "tButton") {
         $tButton = true;
       }
diff --git a/modules/downloadfullsize/controllers/downloadfullsize.php b/modules/downloadfullsize/controllers/downloadfullsize.php
index bd7991fa..c39ce271 100644
--- a/modules/downloadfullsize/controllers/downloadfullsize.php
+++ b/modules/downloadfullsize/controllers/downloadfullsize.php
@@ -18,11 +18,18 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class downloadfullsize_Controller extends Controller {
+<<<<<<< HEAD:modules/downloadfullsize/controllers/downloadfullsize.php
   
+=======
+
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/controllers/downloadfullsize.php
   public function send($id) {
     $item = ORM::factory("item", $id);
     access::required("view_full", $item);
     download::force($item->file_path());
+<<<<<<< HEAD:modules/downloadfullsize/controllers/downloadfullsize.php
     return ;
+=======
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/controllers/downloadfullsize.php
   }
 }
diff --git a/modules/downloadfullsize/helpers/downloadfullsize_installer.php b/modules/downloadfullsize/helpers/downloadfullsize_installer.php
index 47b7916a..e799b345 100644
--- a/modules/downloadfullsize/helpers/downloadfullsize_installer.php
+++ b/modules/downloadfullsize/helpers/downloadfullsize_installer.php
@@ -20,13 +20,19 @@ class downloadfullsize_installer {
   static function install() {
     $version = module::get_version("downloadfullsize");
     if ($version == 0) {
+<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_installer.php
       /* @todo Put database creation here */
+=======
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_installer.php
       module::set_version("downloadfullsize", 1);
     }
   }
 
   static function uninstall() {
+<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_installer.php
     /* @todo Put database table drops here */
+=======
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_installer.php
     module::delete("downloadfullsize");
   }
 }
diff --git a/modules/downloadfullsize/helpers/downloadfullsize_menu.php b/modules/downloadfullsize/helpers/downloadfullsize_menu.php
index 4fd374dc..fbeeb47c 100644
--- a/modules/downloadfullsize/helpers/downloadfullsize_menu.php
+++ b/modules/downloadfullsize/helpers/downloadfullsize_menu.php
@@ -31,6 +31,10 @@ class downloadfullsize_menu_Core {
       }
     }
   }
+<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_menu.php
+=======
+
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_menu.php
   static function admin($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
diff --git a/modules/downloadfullsize/helpers/downloadfullsize_theme.php b/modules/downloadfullsize/helpers/downloadfullsize_theme.php
index 450a57d0..530af96d 100644
--- a/modules/downloadfullsize/helpers/downloadfullsize_theme.php
+++ b/modules/downloadfullsize/helpers/downloadfullsize_theme.php
@@ -1,4 +1,9 @@
+<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_theme.php
 <?php defined("SYSPATH") or die("No direct script access.");/**
+=======
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_theme.php
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2009 Bharat Mediratta
  *
@@ -18,6 +23,7 @@
  */
 class downloadfullsize_theme {
   static function sidebar_blocks($theme) {
+<<<<<<< HEAD:modules/downloadfullsize/helpers/downloadfullsize_theme.php
     if ($theme->item()->is_photo()) {
       if (access::can("view_full", $theme->item)) {
         if (module::get_var("downloadfullsize", "tButton")) {
@@ -33,4 +39,20 @@ class downloadfullsize_theme {
       }
     }
   }  
+=======
+    $item = $theme->item();
+    if ($item && $item->is_photo() && access::can("view_full", $item)) {
+      if (module::get_var("downloadfullsize", "tButton")) {
+        $block = new Block();
+        $block->css_id = "gDownloadFullsize";
+        $block->title = t("Download");
+        $block->content = new View("downloadfullsize_block.html");
+
+        $block->content->item = ORM::factory("item", 1);
+
+        return $block;
+      }
+    }
+  }
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/helpers/downloadfullsize_theme.php
 }
diff --git a/modules/downloadfullsize/views/downloadfullsize_block.html.php b/modules/downloadfullsize/views/downloadfullsize_block.html.php
index 9ce631eb..f109f375 100644
--- a/modules/downloadfullsize/views/downloadfullsize_block.html.php
+++ b/modules/downloadfullsize/views/downloadfullsize_block.html.php
@@ -1,7 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
 <div class="gDownloadFullsizeBlock">
+<<<<<<< HEAD:modules/downloadfullsize/views/downloadfullsize_block.html.php
 <a href="<?= url::site("downloadfullsize/send/$theme->item")
  ?>" title="<?= t("Download Photo") ?>"
+=======
+<a href="<?= url::site("downloadfullsize/send/$theme->item") ?>"
+   title="<?= t("Download Photo") ?>"
+>>>>>>> gallery3-contrib/master:modules/downloadfullsize/views/downloadfullsize_block.html.php
   class="gButtonLink ui-icon-left ui-state-default ui-corner-all"><?= t("Download Fullsize Image") ?></a>
 </div>