Doing the actual commit. I'm not sure what happened last time.
Just two conflicting tests now.