solved desktop conflict during cherry pick

app/views/desktop_widgets/edit.html.erb

@@ -0,0 +1,16 @@
+<div>
+	<%= @dw.name %>
+
+	<h4>Upload Widget image </h4>
+	<div class="main2">
+		<%= form_for @dw, :url => desktop_widget_path(@dw) do |f| %>
+
+		<p>
+		<%= f.file_field :image %>
+		</p>
+		<%= submit_tag  %>
+
+		<% end %>
+
+	</div>
+</div>

app/views/desktop_widgets/index.html.erb

@@ -0,0 +1,10 @@
+<div>
+	<ul>
+		<% @desktopWidgets.each do |dw| %>
+			<li> <%= dw.name %> 
+				<%= link_to "Delete", desktop_widget_path(dw), :method=>"delete" %>
+				<%= link_to "Edit", edit_desktop_widget_path(dw) %>
+			</li> 
+		<% end %>
+	</ul>
+</div>