User 1 add file1.html
User 1 modify 1
Merge remote-tracking branch 'origin/master'