finish git learning
conflict solve