gitgutter setting
Merge remote-tracking branch 'origin/offair'