edit in branch feature
edit in branch master
edit after merge