add gitgutter
conflict fixed