First commit in branch testing3
Second commit in branch testing3
Commit in master branch
conflict resolved