4210a4f1cf
Detecting conflicts was failing because of an undefined function call & an unknown "Timeline" keymap in the keymap hierarchy.