Stray $
Merge remote-tracking branch 'origin/refactor' into refactor