2. Channel Fear System
3. main

Rebasing (1/8)
Performing inexact rename detection:  12% (660/5324)
Performing inexact rename detection:  13% (704/5324)
Performing inexact rename detection:  14% (748/5324)
Performing inexact rename detection:  15% (836/5324)
Performing inexact rename detection:  16% (880/5324)
Performing inexact rename detection:  17% (924/5324)
Performing inexact rename detection:  18% (968/5324)
Performing inexact rename detection:  19% (1012/5324)
Performing inexact rename detection:  20% (1100/5324)
Performing inexact rename detection:  21% (1144/5324)
Performing inexact rename detection:  22% (1188/5324)
Performing inexact rename detection:  23% (1232/5324)
Performing inexact rename detection:  24% (1320/5324)
Performing inexact rename detection:  25% (1364/5324)
Performing inexact rename detection:  26% (1408/5324)
Performing inexact rename detection:  27% (1452/5324)
Performing inexact rename detection:  28% (1496/5324)
Performing inexact rename detection:  29% (1584/5324)
Performing inexact rename detection:  30% (1628/5324)
Performing inexact rename detection:  31% (1672/5324)
Performing inexact rename detection:  32% (1716/5324)
Performing inexact rename detection:  33% (1760/5324)
Performing inexact rename detection:  34% (1848/5324)
Performing inexact rename detection:  35% (1892/5324)
Performing inexact rename detection:  36% (1936/5324)
Performing inexact rename detection:  37% (1980/5324)
Performing inexact rename detection:  38% (2024/5324)
Performing inexact rename detection:  39% (2112/5324)
Performing inexact rename detection:  40% (2156/5324)
Performing inexact rename detection:  41% (2200/5324)
Performing inexact rename detection:  42% (2244/5324)
Performing inexact rename detection:  43% (2332/5324)
Performing inexact rename detection:  44% (2376/5324)
Performing inexact rename detection:  45% (2420/5324)
Performing inexact rename detection:  46% (2464/5324)
Performing inexact rename detection:  47% (2508/5324)
Performing inexact rename detection:  48% (2596/5324)
Performing inexact rename detection:  49% (2640/5324)
Performing inexact rename detection:  50% (2684/5324)
Performing inexact rename detection:  51% (2728/5324)
Performing inexact rename detection:  52% (2772/5324)
Performing inexact rename detection:  53% (2860/5324)
Performing inexact rename detection:  54% (2904/5324)
Performing inexact rename detection:  55% (2948/5324)
Performing inexact rename detection:  56% (2992/5324)
Performing inexact rename detection:  57% (3036/5324)
Performing inexact rename detection:  58% (3124/5324)
Performing inexact rename detection:  59% (3168/5324)
Performing inexact rename detection:  60% (3212/5324)
Performing inexact rename detection:  61% (3256/5324)
Performing inexact rename detection:  62% (3344/5324)
Performing inexact rename detection:  63% (3388/5324)
Performing inexact rename detection:  64% (3432/5324)
Performing inexact rename detection:  65% (3476/5324)
Performing inexact rename detection:  66% (3520/5324)
Performing inexact rename detection:  67% (3608/5324)
Performing inexact rename detection:  68% (3652/5324)
Performing inexact rename detection:  69% (3696/5324)
Performing inexact rename detection:  70% (3740/5324)
Performing inexact rename detection:  71% (3784/5324)
Performing inexact rename detection:  72% (3872/5324)
Performing inexact rename detection:  73% (3916/5324)
Performing inexact rename detection:  74% (3960/5324)
Performing inexact rename detection:  75% (4004/5324)
Performing inexact rename detection:  76% (4048/5324)
Performing inexact rename detection:  77% (4136/5324)
Performing inexact rename detection:  78% (4180/5324)
Performing inexact rename detection:  79% (4224/5324)
Performing inexact rename detection:  86% (4620/5324)
Performing inexact rename detection:  87% (4664/5324)
Performing inexact rename detection:  88% (4708/5324)
Performing inexact rename detection:  93% (4972/5324)
Performing inexact rename detection:  94% (5016/5324)
Performing inexact rename detection:  95% (5060/5324)
Performing inexact rename detection:  96% (5148/5324)
Performing inexact rename detection:  97% (5192/5324)
Performing inexact rename detection:  98% (5236/5324)
Performing inexact rename detection:  99% (5280/5324)
Performing inexact rename detection: 100% (5324/5324)
Performing inexact rename detection: 100% (5324/5324), done.
error: could not apply 4a81b95... fix new item default label malformated
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 4a81b95... fix new item default label malformated
Auto-merging module/sheets/actor-sheet.mjs
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
 (1)