files with ~HEAD appended to otherwise duplicate names appearing after a GitHub merge

These conflict markers suggest that you are not finished merging. This is metadata file stuff like the corny hidden .svn folders (or was it svn folders?) that Subversion would put in each of your folders.