fixed fuck up on profile

Halalan-FINAL/app/views/pages/profile.html.erb

@@ -6,7 +6,6 @@
 	    <div class="col-md-12">	
 			<h2>Hey <%=current_user.first_name%>!</h2>
 			<br>
-<<<<<<< HEAD
 			<h4>You Voted for:</h4>
 			<br>
 			<ul>
@@ -38,26 +37,6 @@
         <h5></h5>
       <%end%>
 			</ul>
-=======
-			<% if @currentuser.votes.size > 0 %>
-				You Voted for:
-				<br>
-				<ul>
-					<%current_user.votes.each do |v|%>
-					<li>
-						<%="#{v.candidate.position.name}: #{v.candidate.full_name}"%>
-						<p>
-							Comments: <%=v.comment%>
-						</p>
-					</li>
-					<%end%>
-				</ul>
-			<%else%>
-				<center>
-					<h4> <%= link_to "You haven't voted for any candidates yet. Vote Now!", "/voting/votes" %> </h4>
-				</center>
-			<%end%>
->>>>>>> 9a919a4f1954bbaa640bd8813e4bc205c39e1657
 		</div>
 	</div>
 </div>
\ No newline at end of file