Square Manage Conflict