diff --git a/src/accounts/views/views.py b/src/accounts/views/views.py
index 895ebe7..392e6ba 100644
--- a/src/accounts/views/views.py
+++ b/src/accounts/views/views.py
@@ -154,7 +154,6 @@ def profile(request, user_name):
 
 	return render(request,'accounts/profile.html', {'user':user_obj, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas,
 		'rank': rank, 'score' : somme, 'member' : member, 'cats':cats})
-<<<<<<< HEAD
 
 @login_required
 def delete_account(request):