see how gitit handle conflict