attila@ubuntu:~/OpenFOAM/OpenFOAM-1.6-ext$ git merge remotes/origin/hotfix/ThirdParty_scripts
Auto-merging etc/settings.csh
CONFLICT (content): Merge conflict in etc/settings.csh
Auto-merging etc/settings.sh
Automatic merge failed; fix conflicts and then commit the result.
attila@ubuntu:~/OpenFOAM/OpenFOAM-1.6-ext$ git merge remotes/origin/hotfix/ThirdParty_scripts
fatal: 'merge' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.

Do you know what's the problem? Where can I find a description about git install of 1.6-ext for dummies?