fix git merge command

On branch master
Changes to be committed:

	modified:   setup_part2_nonroot.sh