Merge test   (use "git reset HEAD <file>..." to unstage)