added file 2, again
inserted some text to 2, to try git-pull --edit
fix merge conflict