adding change that will bring conflict 1
added file3 to master
changed file1 in master
merge b2 with master
changed few files in master
merged with master