neighbor highlight
divir commit
manually resolved merge conflicts