commit 3 from user 2
Merge remote-tracking branch 'origin/master'
commit 5 from user 2
solve conflict issue