commit change
add file 2
add file 3
add conflict on master
add conflict on feature_a
resolve conflict master and featuer_a