Man, I really need to learn how to merge between repos.  This was the painful method!