Merging so I can open a stash
Trying to fix a merge conflict
Solved updated outsideRanges problem