Pushed the merge to my branch. Should be good now.