Working correctly again. It seems that merging added several 'HEAD' pieces into the code. I'm sure that it was where there were catastrophic erros. I suppose the method of fixing these is to just merge and fix. How the heck did I end up forcing the merge though? It told me like six times that it just couldn't merge.