add file2
git merge --no-commit origin/master