Implement conflict resolution logic

members/urls.py

@@ -17,6 +17,7 @@ from members.views import member_delete_confirm
 from members.views import member_delete
 from members.views import payment_list
 from members.views import member_duplicates
+from members.views import resolve_conflict
 
 # rest api
 from members.views import MemberDetail
@@ -104,6 +105,9 @@ urlpatterns = [
     url(r'^api/members/(?P<pk>\d+)$', MemberDetail.as_view()),
 
     # member duplicate resolution view
-    url(r'^duplicates$', member_duplicates)
+    url(r'^duplicates$', member_duplicates),
+
+    # post target for resolving a conflict
+    url(r'^resolve_conflict$', resolve_conflict)
 
 ]