user1 made some changes
Merge branch 'master' into user1
modifeid file2
user1 made chages
Merge branch 'user1'