I think this fixes things, I'm not sure.
I reset master to the log entry before Raz's push.