I believe I fixed all of the oopsy poopsies. Which really was just a couple of unchanged lines, but it took almost 2 hours to find them by examining the merge mess one by one, hopefully everything is now copesetic.