reset to commit 3
merge origin/master to local master