Adding GSP changes to enable adding a conflict

Conflicts can now be added via the client edit page.
Next step is to search for conflicts with similar names
when a new client is create