lots of path fixing

app/controllers/merged/images_controller.rb

@@ -8,7 +8,7 @@ module Merged
 
     def create
       new_image = Image.create_new(params['filename'] , params['image_file'])
-      redirect = :merge_images
+      redirect = :merged_images
       if(params[:redirect])
         redirect = params[:redirect].gsub("NEW" ,new_image.name)
         puts "image redirect #{redirect}"

app/controllers/merged/merged_controller.rb

@@ -1,6 +1,6 @@
 module Merged
   class MergedController < ApplicationController
-    layout 'merge_layout'
+    layout 'merged_layout'
 
   end
 end

app/controllers/merged/sections_controller.rb

@@ -9,7 +9,7 @@ module Merged
     def set_image
       @section.content["image"] = params[:image]
       @page.save
-      redirect_to merge_page_section_url(@page.id,@section.id)
+      redirect_to page_section_url(@page.id,@section.id)
     end
 
     def update
@@ -21,7 +21,7 @@ module Merged
         end
       end
       @page.save
-      redirect_to :merge_page_section
+      redirect_to :merged_page_section
     end
 
     private