Fixing Social Distance Conflict