branch test
master branch commit
branch feature 1  value is 2
branch master  value is 1
conflict fixed value is 3
feture branch add line 3
master branch add line 2
master branch add line 2