alter
add new info at branch feature1
new info on branch master
resolve conflct