diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index 998eabf80..293715c62 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -1,77 +1,53 @@
-<div class="top-content">
-	<%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
-	<table width="940px">
-		<tr>
-			<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
-			<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
-			<td rowspan="2">
-			<% if User.current.logged? %>
-                <% unless User.current.user_extensions.identity == 1 %>
-<<<<<<< HEAD
-                 <!--
-                    modified by longjun
-                    <%#link_to l(:label_newtype_contest), :controller => 'contests', :action => 'new_contest' %>
-                -->
-                    <%= link_to(l(:label_newtype_contest),
-                                contest_new_contests_path,
-                                :class => 'icon icon-add',
-                                :target => "_blank")
-                    %>
-=======
-                    <%= link_to(l(:label_newtype_contest),  new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
-                <!-- end longjun -->
-                  <% end %>
-			<% end %>
-			</td>
-			<td rowspan="2" >
-			<div class="project-search" style="float: right">
-                <%= text_field_tag 'name', params[:name], :size => 30 %>
-                <%= hidden_field_tag 'project_type', params[:project_type] %>
-                <%= submit_tag l(:label_search),
-                               :class => "enterprise",
-                               :name => "contests_search"
-                %>
-			</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="padding-left: 8px">
-              <a>
-<<<<<<< HEAD
-                <!--modified by longjun-->
-=======
->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
-                <%= link_to request.host()+"/contests", contests_path %>
-                <!-- end longjun  -->
-              </a>
-            </td>
-	        <td >
-              <%=link_to l(:field_homepage), home_path %> >
-<<<<<<< HEAD
-              <!--
-                    modified by longjun
-                    <%#link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
-                -->
-              <%=link_to l(:label_contest_innovate), contests_path %>
-=======
-              <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
-                <!-- end longjun -->
-            </td>
-		</tr>
-	</table>
-	<% end %>
-</div>						
-<% if @contests.size > 0%>
-<%= sort_contest(@s_state)%>
-<div id="bid-show">
-	<%= render :partial => 'contest_list',
-               :locals => {:contests => @contests, :contest_pages => @contest_pages}
-    %>
-</div>
-<% else %>
-    <%= render :partial => "layouts/no_content"%>
-<% end %>
-
-<% html_title l(:label_contest_list)%>
+<div class="top-content">
+	<%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
+	<table width="940px">
+		<tr>
+			<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
+			<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
+			<td rowspan="2">
+			<% if User.current.logged? %>
+                <% unless User.current.user_extensions.identity == 1 %>
+
+                    <%= link_to(l(:label_newtype_contest),  new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
+                  <% end %>
+			<% end %>
+			</td>
+			<td rowspan="2" >
+			<div class="project-search" style="float: right">
+                <%= text_field_tag 'name', params[:name], :size => 30 %>
+                <%= hidden_field_tag 'project_type', params[:project_type] %>
+                <%= submit_tag l(:label_search),
+                               :class => "enterprise",
+                               :name => "contests_search"
+                %>
+			</div>
+			</td>
+		</tr>
+		<tr>
+			<td style="padding-left: 8px">
+              <a>
+                <%= link_to request.host()+"/contests", contests_path %>
+              </a>
+            </td>
+	        <td >
+              <%=link_to l(:field_homepage), home_path %> >
+              <%=link_to l(:label_contest_innovate), contests_path %>
+              <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
+            </td>
+		</tr>
+	</table>
+	<% end %>
+</div>						
+<% if @contests.size > 0%>
+<%= sort_contest(@s_state)%>
+<div id="bid-show">
+	<%= render :partial => 'contest_list',
+               :locals => {:contests => @contests, :contest_pages => @contest_pages}
+    %>
+</div>
+<% else %>
+    <%= render :partial => "layouts/no_content"%>
+<% end %>
+
+<% html_title l(:label_contest_list)%>
+s
\ No newline at end of file