mod text2
new branch in text2
fffff on feature1
mmmmm text2.txt on master
fixe conflict
Merge branch 'master' of github.com:rekhubs/git_first