• http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git

This is how you can add remote thingys to your project and pull/push them back into your GitHub repo.

From: http://github.com/guides/keeping-a-git-fork-in-sync-with-the-forked-repo

Here's another suggestion, from Randall Schwartz video:

• http://video.google.com/videoplay?docid=-3999952944619245780

• http://www.kernel.org/pub/software/scm/git/docs/git-merge.html