Also please make future merges squash merges or the history will look so ugly I will die.
I actually really hate merges, I think that these changes should be rebased on to intake or something eles, then git reset --hard 01301e3 and you can squash merge back after the intake code is finalized.