Lerrissirrel newfeatures

OK, GitHub has me confused now.  It shows that I have a side branch of code copied from Lerrissirrel that has changes that are not yet incorporated into my main branch.
So I downloaded both versions and compared them - looking specifically for the places where it says I am missing a line.  Those lines of code ARE in the main branch.
I have a backup of the repo as it is now (and my own local working copies) so there is no danger of losing code.  SO I guess I'll click that big green button and see what happens.