Fixing impromptu conflicts