[fix/loyaltycascade, makeown] remove unit from current conflict activities#1428

myk002 merged 1 commit intoDFHack:masterDFHack/scripts:masterfrom

myk002:myk_make_calmmyk002/scripts:myk_make_calmCopy head branch name to clipboard