I had to manually merge my changes... ugh.